From e687e1d44fec719826bbe95bdfbcb35c77260869 Mon Sep 17 00:00:00 2001
From: Herman Venter <hermanv@fb.com>
Date: Fri, 7 Feb 2014 16:50:11 -0800
Subject: [PATCH] Fixes for Code Model for query expressions.

The serialization code for query expressions did not match the actual code model in a various places. Also, the model for into expressions was incorrect. Also changed the way that order by AST nodes are constructed because the tokens for ascending and descending always report 0 as their token id value.

Reviewed By: @paroski

Differential Revision: D1157921
---
 hphp/compiler/expression/join_clause.cpp         |  2 +-
 hphp/compiler/expression/ordering.cpp            | 40 ++++++++++--------------
 hphp/compiler/expression/ordering.h              |  6 ++--
 hphp/compiler/expression/query_expression.cpp    |  5 +--
 hphp/compiler/expression/simple_query_clause.cpp |  8 +++--
 hphp/compiler/parser/parser.cpp                  |  2 +-
 hphp/test/quick/phinq/from1.php.expect           | 10 +++---
 hphp/test/quick/phinq/from2.php.expect           | 14 ++++-----
 hphp/test/quick/phinq/groupby1.php.expect        | 10 +++---
 hphp/test/quick/phinq/groupby2.php.expect        | 10 +++---
 hphp/test/quick/phinq/groupby3.php.expect        | 10 +++---
 hphp/test/quick/phinq/into1.php.expect           | 10 +++---
 hphp/test/quick/phinq/into2.php.expect           | 10 +++---
 hphp/test/quick/phinq/join1.php.expect           | 10 +++---
 hphp/test/quick/phinq/join2.php.expect           | 10 +++---
 hphp/test/quick/phinq/join3.php.expect           |  8 ++---
 hphp/test/quick/phinq/let1.php.expect            | 10 +++---
 hphp/test/quick/phinq/orderby1.php.expect        | 10 +++---
 hphp/test/quick/phinq/orderby2.php.expect        | 16 +++++-----
 hphp/test/quick/phinq/select1.php.expect         | 10 +++---
 hphp/test/quick/phinq/select2.php.expect         |  8 ++---
 hphp/test/quick/phinq/where1.php.expect          | 10 +++---
 22 files changed, 114 insertions(+), 115 deletions(-)
 rewrite hphp/test/quick/phinq/from1.php.expect (88%)
 rewrite hphp/test/quick/phinq/from2.php.expect (87%)
 rewrite hphp/test/quick/phinq/groupby1.php.expect (92%)
 rewrite hphp/test/quick/phinq/groupby2.php.expect (90%)
 rewrite hphp/test/quick/phinq/groupby3.php.expect (93%)
 rewrite hphp/test/quick/phinq/into1.php.expect (94%)
 rewrite hphp/test/quick/phinq/into2.php.expect (95%)
 rewrite hphp/test/quick/phinq/join1.php.expect (95%)
 rewrite hphp/test/quick/phinq/join2.php.expect (93%)
 rewrite hphp/test/quick/phinq/join3.php.expect (86%)
 rewrite hphp/test/quick/phinq/let1.php.expect (92%)
 rewrite hphp/test/quick/phinq/orderby1.php.expect (88%)
 rewrite hphp/test/quick/phinq/orderby2.php.expect (96%)
 rewrite hphp/test/quick/phinq/select1.php.expect (95%)
 rewrite hphp/test/quick/phinq/select2.php.expect (93%)
 rewrite hphp/test/quick/phinq/where1.php.expect (95%)

diff --git a/hphp/compiler/expression/join_clause.cpp b/hphp/compiler/expression/join_clause.cpp
index 8f4e58e8f5d..96335645e43 100644
--- a/hphp/compiler/expression/join_clause.cpp
+++ b/hphp/compiler/expression/join_clause.cpp
@@ -104,7 +104,7 @@ void JoinClause::outputCodeModel(CodeGenerator &cg) {
   auto numProps = 5;
   if (!m_group.empty()) numProps++;
   cg.printObjectHeader("JoinClause", numProps);
-  cg.printPropertyHeader("variable");
+  cg.printPropertyHeader("identifier");
   cg.printValue(m_var);
   cg.printPropertyHeader("collection");
   m_coll->outputCodeModel(cg);
diff --git a/hphp/compiler/expression/ordering.cpp b/hphp/compiler/expression/ordering.cpp
index 6c1d426eb4d..3dfa1de64b9 100644
--- a/hphp/compiler/expression/ordering.cpp
+++ b/hphp/compiler/expression/ordering.cpp
@@ -17,6 +17,7 @@
 #include "hphp/compiler/expression/ordering.h"
 #include "hphp/compiler/analysis/code_error.h"
 #include "hphp/runtime/base/complex-types.h"
+#include "hphp/compiler/code_model_enums.h"
 
 using namespace HPHP;
 
@@ -25,9 +26,17 @@ using namespace HPHP;
 
 Ordering::Ordering
 (EXPRESSION_CONSTRUCTOR_PARAMETERS,
- ExpressionPtr key, TokenID direction)
+ ExpressionPtr key, std::string direction)
   : Expression(EXPRESSION_CONSTRUCTOR_PARAMETER_VALUES(Ordering)),
-    m_key(key), m_direction(direction){
+    m_key(key) {
+  if (direction == "") {
+    m_direction = PHP_NOT_SPECIFIED;
+  } else if (strcasecmp(direction.c_str(), "ascending") == 0) {
+    m_direction = PHP_ASCENDING;
+  } else {
+    assert(strcasecmp(direction.c_str(), "descending") == 0);
+    m_direction = PHP_DESCENDING;
+  }
 }
 
 ExpressionPtr Ordering::clone() {
@@ -82,26 +91,11 @@ TypePtr Ordering::inferTypes(AnalysisResultPtr ar, TypePtr type,
 ///////////////////////////////////////////////////////////////////////////////
 
 void Ordering::outputCodeModel(CodeGenerator &cg) {
-  int direction;
-  switch (m_direction) {
-  case T_ASCENDING:
-    direction = 1;
-    break;
-  case T_DESCENDING:
-    direction = 2;
-    break;
-  default:
-    direction = 3;
-    break;
-  }
-  auto propCount = direction > 0 ? 3 : 2;
-  cg.printObjectHeader("Ordering", propCount);
-  cg.printPropertyHeader("key");
+  cg.printObjectHeader("Ordering", 3);
+  cg.printPropertyHeader("expression");
   m_key->outputCodeModel(cg);
-  if (propCount == 3) {
-    cg.printPropertyHeader("direction");
-    cg.printValue(direction);
-  }
+  cg.printPropertyHeader("order");
+  cg.printValue(m_direction);
   cg.printPropertyHeader("sourceLocation");
   cg.printLocation(this->getLocation());
   cg.printObjectFooter();
@@ -113,10 +107,10 @@ void Ordering::outputCodeModel(CodeGenerator &cg) {
 void Ordering::outputPHP(CodeGenerator &cg, AnalysisResultPtr ar) {
   m_key->outputPHP(cg, ar);
   switch (m_direction) {
-  case T_ASCENDING:
+  case PHP_ASCENDING:
     cg_printf(" ascending");
     break;
-  case T_DESCENDING:
+  case PHP_DESCENDING:
     cg_printf(" decending");
     break;
   default:
diff --git a/hphp/compiler/expression/ordering.h b/hphp/compiler/expression/ordering.h
index f9627951892..4b73025e3a3 100644
--- a/hphp/compiler/expression/ordering.h
+++ b/hphp/compiler/expression/ordering.h
@@ -30,15 +30,15 @@ class Ordering : public Expression {
 
 public:
   Ordering(EXPRESSION_CONSTRUCTOR_PARAMETERS,
-    ExpressionPtr key, TokenID direction);
+    ExpressionPtr key, std::string direction);
 
   DECLARE_EXPRESSION_VIRTUAL_FUNCTIONS;
 
   ExpressionPtr getKey() const { return m_key; }
-  TokenID getDirection() { return m_direction; }
+  int getDirection() { return m_direction; }
 private:
   ExpressionPtr m_key;
-  TokenID m_direction;
+  int m_direction;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/hphp/compiler/expression/query_expression.cpp b/hphp/compiler/expression/query_expression.cpp
index 174b45811d0..e185904dbf5 100644
--- a/hphp/compiler/expression/query_expression.cpp
+++ b/hphp/compiler/expression/query_expression.cpp
@@ -249,11 +249,12 @@ TypePtr QueryOrderby::inferTypes(AnalysisResultPtr ar, TypePtr type,
 void QueryOrderby::outputCodeModel(CodeGenerator &cg) {
   if (this->getKindOf() == Expression::KindOfOrderbyClause) {
     cg.printObjectHeader("OrderbyClause", 2);
+    cg.printPropertyHeader("orders");
   } else {
     cg.printObjectHeader("QueryExpression", 2);
+    cg.printPropertyHeader("clauses");
   }
-  cg.printPropertyHeader("clauses");
-  m_originalExpressions->outputCodeModel(cg);
+  cg.printExpressionVector(m_originalExpressions);
   cg.printPropertyHeader("sourceLocation");
   cg.printLocation(this->getLocation());
   cg.printObjectFooter();
diff --git a/hphp/compiler/expression/simple_query_clause.cpp b/hphp/compiler/expression/simple_query_clause.cpp
index 823f4cd478a..504c4a77ad3 100644
--- a/hphp/compiler/expression/simple_query_clause.cpp
+++ b/hphp/compiler/expression/simple_query_clause.cpp
@@ -97,8 +97,12 @@ void SimpleQueryClause::outputCodeModel(CodeGenerator &cg) {
       cg.printObjectHeader("IntoClause", 3);
       cg.printPropertyHeader("identifier");
       cg.printValue(m_identifier);
-      cg.printPropertyHeader("query");
-      break;
+      cg.printPropertyHeader("clauses");
+      cg.printExpressionVector(m_expression);
+      cg.printPropertyHeader("sourceLocation");
+      cg.printLocation(this->getLocation());
+      cg.printObjectFooter();
+      return;
     case Expression::KindOfWhereClause:
       cg.printObjectHeader("WhereClause", 2);
       cg.printPropertyHeader("condition");
diff --git a/hphp/compiler/parser/parser.cpp b/hphp/compiler/parser/parser.cpp
index 3354b3b01fc..c858c88bf57 100644
--- a/hphp/compiler/parser/parser.cpp
+++ b/hphp/compiler/parser/parser.cpp
@@ -1965,7 +1965,7 @@ void Parser::onOrdering(Token &out, Token *orderings, Token &ordering) {
 }
 
 void Parser::onOrderingExpr(Token &out, Token &expr, Token *direction) {
-  out->exp = NEW_EXP(Ordering, expr.exp, (direction) ? direction->num() : 0);
+  out->exp = NEW_EXP(Ordering, expr.exp, (direction) ? direction->text() : "");
 }
 
 void Parser::onSelectClause(Token &out, Token &expr) {
diff --git a/hphp/test/quick/phinq/from1.php.expect b/hphp/test/quick/phinq/from1.php.expect
dissimilarity index 88%
index c023ff15291..0425d63ae7e 100644
--- a/hphp/test/quick/phinq/from1.php.expect
+++ b/hphp/test/quick/phinq/from1.php.expect
@@ -1,5 +1,5 @@
-string(5052) with \000 printed as <0>:
-O:19:"CodeQueryExpression":2:{s:28:"<0>CodeQueryExpression<0>clauses";O:14:"CodeFromClause":3:{s:26:"<0>CodeFromClause<0>identifier";s:1:"c";s:26:"<0>CodeFromClause<0>collection";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:14:"@query_param_0";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:9;s:27:"<0>CodeSourceLocation<0>endLine";i:9;s:31:"<0>CodeSourceLocation<0>startColumn";i:17;s:29:"<0>CodeSourceLocation<0>endColumn";i:26;}}s:30:"<0>CodeFromClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:9;s:27:"<0>CodeSourceLocation<0>endLine";i:9;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:26;}}O:14:"CodeFromClause":3:{s:26:"<0>CodeFromClause<0>identifier";s:1:"o";s:26:"<0>CodeFromClause<0>collection";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"c";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:10;s:27:"<0>CodeSourceLocation<0>endLine";i:10;s:31:"<0>CodeSourceLocation<0>startColumn";i:17;s:29:"<0>CodeSourceLocation<0>endColumn";i:18;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:6:"Orders";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:10;s:27:"<0>CodeSourceLocation<0>endLine";i:10;s:31:"<0>CodeSourceLocation<0>startColumn";i:17;s:29:"<0>CodeSourceLocation<0>endColumn";i:26;}}s:30:"<0>CodeFromClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:10;s:27:"<0>CodeSourceLocation<0>endLine";i:10;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:26;}}O:16:"CodeSelectClause":2:{s:28:"<0>CodeSelectClause<0>expression";O:32:"CodeSimpleFunctionCallExpression":3:{s:46:"<0>CodeSimpleFunctionCallExpression<0>functionName";s:5:"tuple";s:43:"<0>CodeSimpleFunctionCallExpression<0>arguments";V:9:"HH\Vector":3:{O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"c";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:19;s:29:"<0>CodeSourceLocation<0>endColumn";i:20;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:4:"Name";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:19;s:29:"<0>CodeSourceLocation<0>endColumn";i:26;}}O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"o";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:29;s:29:"<0>CodeSourceLocation<0>endColumn";i:30;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:7:"OrderID";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:29;s:29:"<0>CodeSourceLocation<0>endColumn";i:39;}}O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"o";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:42;s:29:"<0>CodeSourceLocation<0>endColumn";i:43;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:5:"Total";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:42;s:29:"<0>CodeSourceLocation<0>endColumn";i:50;}}}s:48:"<0>CodeSimpleFunctionCallExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:13;s:29:"<0>CodeSourceLocation<0>endColumn";i:51;}}s:32:"<0>CodeSelectClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:51;}}s:35:"<0>CodeQueryExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:9;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:51;}}
-string(7) with \000 printed as <0>:
-closure
-ok
\ No newline at end of file
+string(5072) with \000 printed as <0>:
+O:19:"CodeQueryExpression":2:{s:28:"<0>CodeQueryExpression<0>clauses";V:9:"HH\Vector":3:{O:14:"CodeFromClause":3:{s:26:"<0>CodeFromClause<0>identifier";s:1:"c";s:26:"<0>CodeFromClause<0>collection";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:14:"@query_param_0";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:9;s:27:"<0>CodeSourceLocation<0>endLine";i:9;s:31:"<0>CodeSourceLocation<0>startColumn";i:17;s:29:"<0>CodeSourceLocation<0>endColumn";i:26;}}s:30:"<0>CodeFromClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:9;s:27:"<0>CodeSourceLocation<0>endLine";i:9;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:26;}}O:14:"CodeFromClause":3:{s:26:"<0>CodeFromClause<0>identifier";s:1:"o";s:26:"<0>CodeFromClause<0>collection";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"c";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:10;s:27:"<0>CodeSourceLocation<0>endLine";i:10;s:31:"<0>CodeSourceLocation<0>startColumn";i:17;s:29:"<0>CodeSourceLocation<0>endColumn";i:18;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:6:"Orders";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:10;s:27:"<0>CodeSourceLocation<0>endLine";i:10;s:31:"<0>CodeSourceLocation<0>startColumn";i:17;s:29:"<0>CodeSourceLocation<0>endColumn";i:26;}}s:30:"<0>CodeFromClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:10;s:27:"<0>CodeSourceLocation<0>endLine";i:10;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:26;}}O:16:"CodeSelectClause":2:{s:28:"<0>CodeSelectClause<0>expression";O:32:"CodeSimpleFunctionCallExpression":3:{s:46:"<0>CodeSimpleFunctionCallExpression<0>functionName";s:5:"tuple";s:43:"<0>CodeSimpleFunctionCallExpression<0>arguments";V:9:"HH\Vector":3:{O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"c";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:19;s:29:"<0>CodeSourceLocation<0>endColumn";i:20;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:4:"Name";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:19;s:29:"<0>CodeSourceLocation<0>endColumn";i:26;}}O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"o";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:29;s:29:"<0>CodeSourceLocation<0>endColumn";i:30;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:7:"OrderID";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:29;s:29:"<0>CodeSourceLocation<0>endColumn";i:39;}}O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"o";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:42;s:29:"<0>CodeSourceLocation<0>endColumn";i:43;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:5:"Total";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:42;s:29:"<0>CodeSourceLocation<0>endColumn";i:50;}}}s:48:"<0>CodeSimpleFunctionCallExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:13;s:29:"<0>CodeSourceLocation<0>endColumn";i:51;}}s:32:"<0>CodeSelectClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:51;}}}s:35:"<0>CodeQueryExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:9;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:51;}}
+string(7) with \000 printed as <0>:
+closure
+ok
\ No newline at end of file
diff --git a/hphp/test/quick/phinq/from2.php.expect b/hphp/test/quick/phinq/from2.php.expect
dissimilarity index 87%
index fd8cefee9a9..3be81f03e4d 100644
--- a/hphp/test/quick/phinq/from2.php.expect
+++ b/hphp/test/quick/phinq/from2.php.expect
@@ -1,7 +1,7 @@
-string(8791) with \000 printed as <0>:
-O:19:"CodeQueryExpression":2:{s:28:"<0>CodeQueryExpression<0>clauses";O:14:"CodeFromClause":3:{s:26:"<0>CodeFromClause<0>identifier";s:1:"c";s:26:"<0>CodeFromClause<0>collection";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:14:"@query_param_0";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:9;s:27:"<0>CodeSourceLocation<0>endLine";i:9;s:31:"<0>CodeSourceLocation<0>startColumn";i:17;s:29:"<0>CodeSourceLocation<0>endColumn";i:26;}}s:30:"<0>CodeFromClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:9;s:27:"<0>CodeSourceLocation<0>endLine";i:9;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:26;}}O:14:"CodeFromClause":3:{s:26:"<0>CodeFromClause<0>identifier";s:1:"o";s:26:"<0>CodeFromClause<0>collection";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"c";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:10;s:27:"<0>CodeSourceLocation<0>endLine";i:10;s:31:"<0>CodeSourceLocation<0>startColumn";i:17;s:29:"<0>CodeSourceLocation<0>endColumn";i:18;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:6:"Orders";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:10;s:27:"<0>CodeSourceLocation<0>endLine";i:10;s:31:"<0>CodeSourceLocation<0>startColumn";i:17;s:29:"<0>CodeSourceLocation<0>endColumn";i:26;}}s:30:"<0>CodeFromClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:10;s:27:"<0>CodeSourceLocation<0>endLine";i:10;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:26;}}O:15:"CodeWhereClause":2:{s:26:"<0>CodeWhereClause<0>condition";O:22:"CodeBinaryOpExpression":4:{s:35:"<0>CodeBinaryOpExpression<0>expression1";O:22:"CodeBinaryOpExpression":4:{s:35:"<0>CodeBinaryOpExpression<0>expression1";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"c";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:12;s:29:"<0>CodeSourceLocation<0>endColumn";i:13;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:4:"Name";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:12;s:29:"<0>CodeSourceLocation<0>endColumn";i:19;}}s:35:"<0>CodeBinaryOpExpression<0>expression2";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:14:"@query_param_1";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:24;s:29:"<0>CodeSourceLocation<0>endColumn";i:28;}}s:33:"<0>CodeBinaryOpExpression<0>operation";i:14;s:38:"<0>CodeBinaryOpExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:12;s:29:"<0>CodeSourceLocation<0>endColumn";i:28;}}s:35:"<0>CodeBinaryOpExpression<0>expression2";O:22:"CodeBinaryOpExpression":4:{s:35:"<0>CodeBinaryOpExpression<0>expression1";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:14:"@query_param_2";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:33;s:29:"<0>CodeSourceLocation<0>endColumn";i:35;}}s:35:"<0>CodeBinaryOpExpression<0>expression2";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"o";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:40;s:29:"<0>CodeSourceLocation<0>endColumn";i:41;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:7:"OrderId";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:40;s:29:"<0>CodeSourceLocation<0>endColumn";i:50;}}s:33:"<0>CodeBinaryOpExpression<0>operation";i:14;s:38:"<0>CodeBinaryOpExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:33;s:29:"<0>CodeSourceLocation<0>endColumn";i:50;}}s:33:"<0>CodeBinaryOpExpression<0>operation";i:6;s:38:"<0>CodeBinaryOpExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:12;s:29:"<0>CodeSourceLocation<0>endColumn";i:50;}}s:31:"<0>CodeWhereClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:50;}}O:16:"CodeSelectClause":2:{s:28:"<0>CodeSelectClause<0>expression";O:32:"CodeSimpleFunctionCallExpression":3:{s:46:"<0>CodeSimpleFunctionCallExpression<0>functionName";s:5:"tuple";s:43:"<0>CodeSimpleFunctionCallExpression<0>arguments";V:9:"HH\Vector":3:{O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"c";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:19;s:29:"<0>CodeSourceLocation<0>endColumn";i:20;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:4:"Name";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:19;s:29:"<0>CodeSourceLocation<0>endColumn";i:26;}}O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"o";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:29;s:29:"<0>CodeSourceLocation<0>endColumn";i:30;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:7:"OrderID";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:29;s:29:"<0>CodeSourceLocation<0>endColumn";i:39;}}O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"o";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:42;s:29:"<0>CodeSourceLocation<0>endColumn";i:43;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:5:"Total";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:42;s:29:"<0>CodeSourceLocation<0>endColumn";i:50;}}}s:48:"<0>CodeSimpleFunctionCallExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:13;s:29:"<0>CodeSourceLocation<0>endColumn";i:51;}}s:32:"<0>CodeSelectClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:51;}}s:35:"<0>CodeQueryExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:9;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:51;}}
-string(7) with \000 printed as <0>:
-closure
-string(3) with \000 printed as <0>:
-foo
-int(123)
\ No newline at end of file
+string(8811) with \000 printed as <0>:
+O:19:"CodeQueryExpression":2:{s:28:"<0>CodeQueryExpression<0>clauses";V:9:"HH\Vector":4:{O:14:"CodeFromClause":3:{s:26:"<0>CodeFromClause<0>identifier";s:1:"c";s:26:"<0>CodeFromClause<0>collection";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:14:"@query_param_0";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:9;s:27:"<0>CodeSourceLocation<0>endLine";i:9;s:31:"<0>CodeSourceLocation<0>startColumn";i:17;s:29:"<0>CodeSourceLocation<0>endColumn";i:26;}}s:30:"<0>CodeFromClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:9;s:27:"<0>CodeSourceLocation<0>endLine";i:9;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:26;}}O:14:"CodeFromClause":3:{s:26:"<0>CodeFromClause<0>identifier";s:1:"o";s:26:"<0>CodeFromClause<0>collection";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"c";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:10;s:27:"<0>CodeSourceLocation<0>endLine";i:10;s:31:"<0>CodeSourceLocation<0>startColumn";i:17;s:29:"<0>CodeSourceLocation<0>endColumn";i:18;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:6:"Orders";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:10;s:27:"<0>CodeSourceLocation<0>endLine";i:10;s:31:"<0>CodeSourceLocation<0>startColumn";i:17;s:29:"<0>CodeSourceLocation<0>endColumn";i:26;}}s:30:"<0>CodeFromClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:10;s:27:"<0>CodeSourceLocation<0>endLine";i:10;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:26;}}O:15:"CodeWhereClause":2:{s:26:"<0>CodeWhereClause<0>condition";O:22:"CodeBinaryOpExpression":4:{s:35:"<0>CodeBinaryOpExpression<0>expression1";O:22:"CodeBinaryOpExpression":4:{s:35:"<0>CodeBinaryOpExpression<0>expression1";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"c";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:12;s:29:"<0>CodeSourceLocation<0>endColumn";i:13;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:4:"Name";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:12;s:29:"<0>CodeSourceLocation<0>endColumn";i:19;}}s:35:"<0>CodeBinaryOpExpression<0>expression2";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:14:"@query_param_1";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:24;s:29:"<0>CodeSourceLocation<0>endColumn";i:28;}}s:33:"<0>CodeBinaryOpExpression<0>operation";i:14;s:38:"<0>CodeBinaryOpExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:12;s:29:"<0>CodeSourceLocation<0>endColumn";i:28;}}s:35:"<0>CodeBinaryOpExpression<0>expression2";O:22:"CodeBinaryOpExpression":4:{s:35:"<0>CodeBinaryOpExpression<0>expression1";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:14:"@query_param_2";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:33;s:29:"<0>CodeSourceLocation<0>endColumn";i:35;}}s:35:"<0>CodeBinaryOpExpression<0>expression2";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"o";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:40;s:29:"<0>CodeSourceLocation<0>endColumn";i:41;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:7:"OrderId";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:40;s:29:"<0>CodeSourceLocation<0>endColumn";i:50;}}s:33:"<0>CodeBinaryOpExpression<0>operation";i:14;s:38:"<0>CodeBinaryOpExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:33;s:29:"<0>CodeSourceLocation<0>endColumn";i:50;}}s:33:"<0>CodeBinaryOpExpression<0>operation";i:6;s:38:"<0>CodeBinaryOpExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:12;s:29:"<0>CodeSourceLocation<0>endColumn";i:50;}}s:31:"<0>CodeWhereClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:50;}}O:16:"CodeSelectClause":2:{s:28:"<0>CodeSelectClause<0>expression";O:32:"CodeSimpleFunctionCallExpression":3:{s:46:"<0>CodeSimpleFunctionCallExpression<0>functionName";s:5:"tuple";s:43:"<0>CodeSimpleFunctionCallExpression<0>arguments";V:9:"HH\Vector":3:{O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"c";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:19;s:29:"<0>CodeSourceLocation<0>endColumn";i:20;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:4:"Name";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:19;s:29:"<0>CodeSourceLocation<0>endColumn";i:26;}}O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"o";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:29;s:29:"<0>CodeSourceLocation<0>endColumn";i:30;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:7:"OrderID";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:29;s:29:"<0>CodeSourceLocation<0>endColumn";i:39;}}O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"o";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:42;s:29:"<0>CodeSourceLocation<0>endColumn";i:43;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:5:"Total";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:42;s:29:"<0>CodeSourceLocation<0>endColumn";i:50;}}}s:48:"<0>CodeSimpleFunctionCallExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:13;s:29:"<0>CodeSourceLocation<0>endColumn";i:51;}}s:32:"<0>CodeSelectClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:51;}}}s:35:"<0>CodeQueryExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:9;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:51;}}
+string(7) with \000 printed as <0>:
+closure
+string(3) with \000 printed as <0>:
+foo
+int(123)
\ No newline at end of file
diff --git a/hphp/test/quick/phinq/groupby1.php.expect b/hphp/test/quick/phinq/groupby1.php.expect
dissimilarity index 92%
index 6c1ca03a646..67e2bff45c0 100644
--- a/hphp/test/quick/phinq/groupby1.php.expect
+++ b/hphp/test/quick/phinq/groupby1.php.expect
@@ -1,5 +1,5 @@
-string(4585) with \000 printed as <0>:
-O:19:"CodeQueryExpression":2:{s:28:"<0>CodeQueryExpression<0>clauses";O:14:"CodeFromClause":3:{s:26:"<0>CodeFromClause<0>identifier";s:1:"c";s:26:"<0>CodeFromClause<0>collection";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:14:"@query_param_0";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:17;s:29:"<0>CodeSourceLocation<0>endColumn";i:26;}}s:30:"<0>CodeFromClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:26;}}O:15:"CodeGroupClause":3:{s:27:"<0>CodeGroupClause<0>collection";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"c";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:12;s:29:"<0>CodeSourceLocation<0>endColumn";i:13;}}s:20:"<0>CodeGroupClause<0>key";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"c";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:18;s:29:"<0>CodeSourceLocation<0>endColumn";i:19;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:7:"Country";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:18;s:29:"<0>CodeSourceLocation<0>endColumn";i:28;}}s:31:"<0>CodeGroupClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:28;}}O:14:"CodeIntoClause":3:{s:26:"<0>CodeIntoClause<0>identifier";s:1:"g";s:21:"<0>CodeIntoClause<0>query";O:16:"CodeSelectClause":2:{s:28:"<0>CodeSelectClause<0>expression";O:32:"CodeSimpleFunctionCallExpression":3:{s:46:"<0>CodeSimpleFunctionCallExpression<0>functionName";s:5:"tuple";s:43:"<0>CodeSimpleFunctionCallExpression<0>arguments";V:9:"HH\Vector":2:{O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"g";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:13;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:32;s:29:"<0>CodeSourceLocation<0>endColumn";i:33;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:3:"Key";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:13;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:32;s:29:"<0>CodeSourceLocation<0>endColumn";i:38;}}O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"g";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:13;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:56;s:29:"<0>CodeSourceLocation<0>endColumn";i:57;}}}s:48:"<0>CodeSimpleFunctionCallExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:13;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:13;s:29:"<0>CodeSourceLocation<0>endColumn";i:68;}}s:32:"<0>CodeSelectClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:13;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:68;}}s:30:"<0>CodeIntoClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:30;s:29:"<0>CodeSourceLocation<0>endColumn";i:68;}}s:35:"<0>CodeQueryExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:68;}}
-string(7) with \000 printed as <0>:
-closure
-ok
\ No newline at end of file
+string(4627) with \000 printed as <0>:
+O:19:"CodeQueryExpression":2:{s:28:"<0>CodeQueryExpression<0>clauses";V:9:"HH\Vector":3:{O:14:"CodeFromClause":3:{s:26:"<0>CodeFromClause<0>identifier";s:1:"c";s:26:"<0>CodeFromClause<0>collection";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:14:"@query_param_0";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:17;s:29:"<0>CodeSourceLocation<0>endColumn";i:26;}}s:30:"<0>CodeFromClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:26;}}O:15:"CodeGroupClause":3:{s:27:"<0>CodeGroupClause<0>collection";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"c";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:12;s:29:"<0>CodeSourceLocation<0>endColumn";i:13;}}s:20:"<0>CodeGroupClause<0>key";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"c";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:18;s:29:"<0>CodeSourceLocation<0>endColumn";i:19;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:7:"Country";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:18;s:29:"<0>CodeSourceLocation<0>endColumn";i:28;}}s:31:"<0>CodeGroupClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:28;}}O:14:"CodeIntoClause":3:{s:26:"<0>CodeIntoClause<0>identifier";s:1:"g";s:23:"<0>CodeIntoClause<0>clauses";V:9:"HH\Vector":1:{O:16:"CodeSelectClause":2:{s:28:"<0>CodeSelectClause<0>expression";O:32:"CodeSimpleFunctionCallExpression":3:{s:46:"<0>CodeSimpleFunctionCallExpression<0>functionName";s:5:"tuple";s:43:"<0>CodeSimpleFunctionCallExpression<0>arguments";V:9:"HH\Vector":2:{O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"g";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:13;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:32;s:29:"<0>CodeSourceLocation<0>endColumn";i:33;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:3:"Key";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:13;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:32;s:29:"<0>CodeSourceLocation<0>endColumn";i:38;}}O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"g";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:13;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:56;s:29:"<0>CodeSourceLocation<0>endColumn";i:57;}}}s:48:"<0>CodeSimpleFunctionCallExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:13;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:13;s:29:"<0>CodeSourceLocation<0>endColumn";i:68;}}s:32:"<0>CodeSelectClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:13;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:68;}}}s:30:"<0>CodeIntoClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:30;s:29:"<0>CodeSourceLocation<0>endColumn";i:68;}}}s:35:"<0>CodeQueryExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:68;}}
+string(7) with \000 printed as <0>:
+closure
+ok
\ No newline at end of file
diff --git a/hphp/test/quick/phinq/groupby2.php.expect b/hphp/test/quick/phinq/groupby2.php.expect
dissimilarity index 90%
index 897f651a86d..bc7d76cc972 100644
--- a/hphp/test/quick/phinq/groupby2.php.expect
+++ b/hphp/test/quick/phinq/groupby2.php.expect
@@ -1,5 +1,5 @@
-string(2816) with \000 printed as <0>:
-O:19:"CodeQueryExpression":2:{s:28:"<0>CodeQueryExpression<0>clauses";O:14:"CodeFromClause":3:{s:26:"<0>CodeFromClause<0>identifier";s:1:"c";s:26:"<0>CodeFromClause<0>collection";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:14:"@query_param_0";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:9;s:27:"<0>CodeSourceLocation<0>endLine";i:9;s:31:"<0>CodeSourceLocation<0>startColumn";i:17;s:29:"<0>CodeSourceLocation<0>endColumn";i:26;}}s:30:"<0>CodeFromClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:9;s:27:"<0>CodeSourceLocation<0>endLine";i:9;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:26;}}O:15:"CodeGroupClause":3:{s:27:"<0>CodeGroupClause<0>collection";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"c";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:10;s:27:"<0>CodeSourceLocation<0>endLine";i:10;s:31:"<0>CodeSourceLocation<0>startColumn";i:12;s:29:"<0>CodeSourceLocation<0>endColumn";i:13;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:4:"Name";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:10;s:27:"<0>CodeSourceLocation<0>endLine";i:10;s:31:"<0>CodeSourceLocation<0>startColumn";i:12;s:29:"<0>CodeSourceLocation<0>endColumn";i:19;}}s:20:"<0>CodeGroupClause<0>key";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"c";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:10;s:27:"<0>CodeSourceLocation<0>endLine";i:10;s:31:"<0>CodeSourceLocation<0>startColumn";i:24;s:29:"<0>CodeSourceLocation<0>endColumn";i:25;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:7:"Country";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:10;s:27:"<0>CodeSourceLocation<0>endLine";i:10;s:31:"<0>CodeSourceLocation<0>startColumn";i:24;s:29:"<0>CodeSourceLocation<0>endColumn";i:34;}}s:31:"<0>CodeGroupClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:10;s:27:"<0>CodeSourceLocation<0>endLine";i:10;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:34;}}s:35:"<0>CodeQueryExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:9;s:27:"<0>CodeSourceLocation<0>endLine";i:10;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:34;}}
-string(7) with \000 printed as <0>:
-closure
-ok
\ No newline at end of file
+string(2836) with \000 printed as <0>:
+O:19:"CodeQueryExpression":2:{s:28:"<0>CodeQueryExpression<0>clauses";V:9:"HH\Vector":2:{O:14:"CodeFromClause":3:{s:26:"<0>CodeFromClause<0>identifier";s:1:"c";s:26:"<0>CodeFromClause<0>collection";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:14:"@query_param_0";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:9;s:27:"<0>CodeSourceLocation<0>endLine";i:9;s:31:"<0>CodeSourceLocation<0>startColumn";i:17;s:29:"<0>CodeSourceLocation<0>endColumn";i:26;}}s:30:"<0>CodeFromClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:9;s:27:"<0>CodeSourceLocation<0>endLine";i:9;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:26;}}O:15:"CodeGroupClause":3:{s:27:"<0>CodeGroupClause<0>collection";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"c";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:10;s:27:"<0>CodeSourceLocation<0>endLine";i:10;s:31:"<0>CodeSourceLocation<0>startColumn";i:12;s:29:"<0>CodeSourceLocation<0>endColumn";i:13;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:4:"Name";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:10;s:27:"<0>CodeSourceLocation<0>endLine";i:10;s:31:"<0>CodeSourceLocation<0>startColumn";i:12;s:29:"<0>CodeSourceLocation<0>endColumn";i:19;}}s:20:"<0>CodeGroupClause<0>key";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"c";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:10;s:27:"<0>CodeSourceLocation<0>endLine";i:10;s:31:"<0>CodeSourceLocation<0>startColumn";i:24;s:29:"<0>CodeSourceLocation<0>endColumn";i:25;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:7:"Country";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:10;s:27:"<0>CodeSourceLocation<0>endLine";i:10;s:31:"<0>CodeSourceLocation<0>startColumn";i:24;s:29:"<0>CodeSourceLocation<0>endColumn";i:34;}}s:31:"<0>CodeGroupClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:10;s:27:"<0>CodeSourceLocation<0>endLine";i:10;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:34;}}}s:35:"<0>CodeQueryExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:9;s:27:"<0>CodeSourceLocation<0>endLine";i:10;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:34;}}
+string(7) with \000 printed as <0>:
+closure
+ok
\ No newline at end of file
diff --git a/hphp/test/quick/phinq/groupby3.php.expect b/hphp/test/quick/phinq/groupby3.php.expect
dissimilarity index 93%
index 2d4189dfadf..04763c833cd 100644
--- a/hphp/test/quick/phinq/groupby3.php.expect
+++ b/hphp/test/quick/phinq/groupby3.php.expect
@@ -1,5 +1,5 @@
-string(7118) with \000 printed as <0>:
-O:19:"CodeQueryExpression":2:{s:28:"<0>CodeQueryExpression<0>clauses";O:14:"CodeFromClause":3:{s:26:"<0>CodeFromClause<0>identifier";s:1:"c";s:26:"<0>CodeFromClause<0>collection";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:14:"@query_param_0";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:17;s:29:"<0>CodeSourceLocation<0>endColumn";i:30;}}s:30:"<0>CodeFromClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:30;}}O:15:"CodeWhereClause":2:{s:26:"<0>CodeWhereClause<0>condition";O:22:"CodeBinaryOpExpression":4:{s:35:"<0>CodeBinaryOpExpression<0>expression1";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"c";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:13;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:12;s:29:"<0>CodeSourceLocation<0>endColumn";i:13;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:2:"Id";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:13;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:12;s:29:"<0>CodeSourceLocation<0>endColumn";i:17;}}s:35:"<0>CodeBinaryOpExpression<0>expression2";O:22:"CodeBinaryOpExpression":4:{s:35:"<0>CodeBinaryOpExpression<0>expression1";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:14:"@query_param_1";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:13;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:22;s:29:"<0>CodeSourceLocation<0>endColumn";i:23;}}s:35:"<0>CodeBinaryOpExpression<0>expression2";O:20:"CodeScalarExpression":2:{s:27:"<0>CodeScalarExpression<0>value";i:1;s:36:"<0>CodeScalarExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:13;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:27;s:29:"<0>CodeSourceLocation<0>endColumn";i:27;}}s:33:"<0>CodeBinaryOpExpression<0>operation";i:34;s:38:"<0>CodeBinaryOpExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:13;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:22;s:29:"<0>CodeSourceLocation<0>endColumn";i:27;}}s:33:"<0>CodeBinaryOpExpression<0>operation";i:14;s:38:"<0>CodeBinaryOpExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:13;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:12;s:29:"<0>CodeSourceLocation<0>endColumn";i:27;}}s:31:"<0>CodeWhereClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:13;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:27;}}O:15:"CodeGroupClause":3:{s:27:"<0>CodeGroupClause<0>collection";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"c";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:14;s:27:"<0>CodeSourceLocation<0>endLine";i:14;s:31:"<0>CodeSourceLocation<0>startColumn";i:12;s:29:"<0>CodeSourceLocation<0>endColumn";i:13;}}s:20:"<0>CodeGroupClause<0>key";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"c";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:14;s:27:"<0>CodeSourceLocation<0>endLine";i:14;s:31:"<0>CodeSourceLocation<0>startColumn";i:18;s:29:"<0>CodeSourceLocation<0>endColumn";i:19;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:7:"Country";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:14;s:27:"<0>CodeSourceLocation<0>endLine";i:14;s:31:"<0>CodeSourceLocation<0>startColumn";i:18;s:29:"<0>CodeSourceLocation<0>endColumn";i:28;}}s:31:"<0>CodeGroupClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:14;s:27:"<0>CodeSourceLocation<0>endLine";i:14;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:28;}}O:14:"CodeIntoClause":3:{s:26:"<0>CodeIntoClause<0>identifier";s:1:"g";s:21:"<0>CodeIntoClause<0>query";O:16:"CodeSelectClause":2:{s:28:"<0>CodeSelectClause<0>expression";O:32:"CodeSimpleFunctionCallExpression":3:{s:46:"<0>CodeSimpleFunctionCallExpression<0>functionName";s:5:"tuple";s:43:"<0>CodeSimpleFunctionCallExpression<0>arguments";V:9:"HH\Vector":2:{O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"g";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:15;s:27:"<0>CodeSourceLocation<0>endLine";i:15;s:31:"<0>CodeSourceLocation<0>startColumn";i:32;s:29:"<0>CodeSourceLocation<0>endColumn";i:33;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:3:"Key";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:15;s:27:"<0>CodeSourceLocation<0>endLine";i:15;s:31:"<0>CodeSourceLocation<0>startColumn";i:32;s:29:"<0>CodeSourceLocation<0>endColumn";i:38;}}O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"g";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:15;s:27:"<0>CodeSourceLocation<0>endLine";i:15;s:31:"<0>CodeSourceLocation<0>startColumn";i:56;s:29:"<0>CodeSourceLocation<0>endColumn";i:57;}}}s:48:"<0>CodeSimpleFunctionCallExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:15;s:27:"<0>CodeSourceLocation<0>endLine";i:15;s:31:"<0>CodeSourceLocation<0>startColumn";i:13;s:29:"<0>CodeSourceLocation<0>endColumn";i:68;}}s:32:"<0>CodeSelectClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:15;s:27:"<0>CodeSourceLocation<0>endLine";i:15;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:68;}}s:30:"<0>CodeIntoClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:14;s:27:"<0>CodeSourceLocation<0>endLine";i:15;s:31:"<0>CodeSourceLocation<0>startColumn";i:30;s:29:"<0>CodeSourceLocation<0>endColumn";i:68;}}s:35:"<0>CodeQueryExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:15;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:68;}}
-string(7) with \000 printed as <0>:
-closure
-int(2)
\ No newline at end of file
+string(7160) with \000 printed as <0>:
+O:19:"CodeQueryExpression":2:{s:28:"<0>CodeQueryExpression<0>clauses";V:9:"HH\Vector":4:{O:14:"CodeFromClause":3:{s:26:"<0>CodeFromClause<0>identifier";s:1:"c";s:26:"<0>CodeFromClause<0>collection";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:14:"@query_param_0";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:17;s:29:"<0>CodeSourceLocation<0>endColumn";i:30;}}s:30:"<0>CodeFromClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:30;}}O:15:"CodeWhereClause":2:{s:26:"<0>CodeWhereClause<0>condition";O:22:"CodeBinaryOpExpression":4:{s:35:"<0>CodeBinaryOpExpression<0>expression1";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"c";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:13;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:12;s:29:"<0>CodeSourceLocation<0>endColumn";i:13;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:2:"Id";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:13;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:12;s:29:"<0>CodeSourceLocation<0>endColumn";i:17;}}s:35:"<0>CodeBinaryOpExpression<0>expression2";O:22:"CodeBinaryOpExpression":4:{s:35:"<0>CodeBinaryOpExpression<0>expression1";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:14:"@query_param_1";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:13;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:22;s:29:"<0>CodeSourceLocation<0>endColumn";i:23;}}s:35:"<0>CodeBinaryOpExpression<0>expression2";O:20:"CodeScalarExpression":2:{s:27:"<0>CodeScalarExpression<0>value";i:1;s:36:"<0>CodeScalarExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:13;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:27;s:29:"<0>CodeSourceLocation<0>endColumn";i:27;}}s:33:"<0>CodeBinaryOpExpression<0>operation";i:34;s:38:"<0>CodeBinaryOpExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:13;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:22;s:29:"<0>CodeSourceLocation<0>endColumn";i:27;}}s:33:"<0>CodeBinaryOpExpression<0>operation";i:14;s:38:"<0>CodeBinaryOpExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:13;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:12;s:29:"<0>CodeSourceLocation<0>endColumn";i:27;}}s:31:"<0>CodeWhereClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:13;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:27;}}O:15:"CodeGroupClause":3:{s:27:"<0>CodeGroupClause<0>collection";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"c";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:14;s:27:"<0>CodeSourceLocation<0>endLine";i:14;s:31:"<0>CodeSourceLocation<0>startColumn";i:12;s:29:"<0>CodeSourceLocation<0>endColumn";i:13;}}s:20:"<0>CodeGroupClause<0>key";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"c";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:14;s:27:"<0>CodeSourceLocation<0>endLine";i:14;s:31:"<0>CodeSourceLocation<0>startColumn";i:18;s:29:"<0>CodeSourceLocation<0>endColumn";i:19;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:7:"Country";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:14;s:27:"<0>CodeSourceLocation<0>endLine";i:14;s:31:"<0>CodeSourceLocation<0>startColumn";i:18;s:29:"<0>CodeSourceLocation<0>endColumn";i:28;}}s:31:"<0>CodeGroupClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:14;s:27:"<0>CodeSourceLocation<0>endLine";i:14;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:28;}}O:14:"CodeIntoClause":3:{s:26:"<0>CodeIntoClause<0>identifier";s:1:"g";s:23:"<0>CodeIntoClause<0>clauses";V:9:"HH\Vector":1:{O:16:"CodeSelectClause":2:{s:28:"<0>CodeSelectClause<0>expression";O:32:"CodeSimpleFunctionCallExpression":3:{s:46:"<0>CodeSimpleFunctionCallExpression<0>functionName";s:5:"tuple";s:43:"<0>CodeSimpleFunctionCallExpression<0>arguments";V:9:"HH\Vector":2:{O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"g";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:15;s:27:"<0>CodeSourceLocation<0>endLine";i:15;s:31:"<0>CodeSourceLocation<0>startColumn";i:32;s:29:"<0>CodeSourceLocation<0>endColumn";i:33;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:3:"Key";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:15;s:27:"<0>CodeSourceLocation<0>endLine";i:15;s:31:"<0>CodeSourceLocation<0>startColumn";i:32;s:29:"<0>CodeSourceLocation<0>endColumn";i:38;}}O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"g";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:15;s:27:"<0>CodeSourceLocation<0>endLine";i:15;s:31:"<0>CodeSourceLocation<0>startColumn";i:56;s:29:"<0>CodeSourceLocation<0>endColumn";i:57;}}}s:48:"<0>CodeSimpleFunctionCallExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:15;s:27:"<0>CodeSourceLocation<0>endLine";i:15;s:31:"<0>CodeSourceLocation<0>startColumn";i:13;s:29:"<0>CodeSourceLocation<0>endColumn";i:68;}}s:32:"<0>CodeSelectClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:15;s:27:"<0>CodeSourceLocation<0>endLine";i:15;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:68;}}}s:30:"<0>CodeIntoClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:14;s:27:"<0>CodeSourceLocation<0>endLine";i:15;s:31:"<0>CodeSourceLocation<0>startColumn";i:30;s:29:"<0>CodeSourceLocation<0>endColumn";i:68;}}}s:35:"<0>CodeQueryExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:15;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:68;}}
+string(7) with \000 printed as <0>:
+closure
+int(2)
\ No newline at end of file
diff --git a/hphp/test/quick/phinq/into1.php.expect b/hphp/test/quick/phinq/into1.php.expect
dissimilarity index 94%
index 00b3b32effd..39db5120c23 100644
--- a/hphp/test/quick/phinq/into1.php.expect
+++ b/hphp/test/quick/phinq/into1.php.expect
@@ -1,5 +1,5 @@
-string(4901) with \000 printed as <0>:
-O:19:"CodeQueryExpression":2:{s:28:"<0>CodeQueryExpression<0>clauses";O:14:"CodeFromClause":3:{s:26:"<0>CodeFromClause<0>identifier";s:7:"student";s:26:"<0>CodeFromClause<0>collection";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:14:"@query_param_0";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:9;s:27:"<0>CodeSourceLocation<0>endLine";i:9;s:31:"<0>CodeSourceLocation<0>startColumn";i:23;s:29:"<0>CodeSourceLocation<0>endColumn";i:31;}}s:30:"<0>CodeFromClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:9;s:27:"<0>CodeSourceLocation<0>endLine";i:9;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:31;}}O:15:"CodeGroupClause":3:{s:27:"<0>CodeGroupClause<0>collection";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:7:"student";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:10;s:27:"<0>CodeSourceLocation<0>endLine";i:10;s:31:"<0>CodeSourceLocation<0>startColumn";i:12;s:29:"<0>CodeSourceLocation<0>endColumn";i:19;}}s:20:"<0>CodeGroupClause<0>key";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:7:"student";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:10;s:27:"<0>CodeSourceLocation<0>endLine";i:10;s:31:"<0>CodeSourceLocation<0>startColumn";i:24;s:29:"<0>CodeSourceLocation<0>endColumn";i:31;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:4:"Year";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:10;s:27:"<0>CodeSourceLocation<0>endLine";i:10;s:31:"<0>CodeSourceLocation<0>startColumn";i:24;s:29:"<0>CodeSourceLocation<0>endColumn";i:37;}}s:31:"<0>CodeGroupClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:10;s:27:"<0>CodeSourceLocation<0>endLine";i:10;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:37;}}O:14:"CodeIntoClause":3:{s:26:"<0>CodeIntoClause<0>identifier";s:5:"years";s:21:"<0>CodeIntoClause<0>query";O:14:"CodeFromClause":3:{s:26:"<0>CodeFromClause<0>identifier";s:7:"student";s:26:"<0>CodeFromClause<0>collection";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:5:"years";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:25;s:29:"<0>CodeSourceLocation<0>endColumn";i:30;}}s:30:"<0>CodeFromClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:8;s:29:"<0>CodeSourceLocation<0>endColumn";i:30;}}O:15:"CodeGroupClause":3:{s:27:"<0>CodeGroupClause<0>collection";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:7:"student";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:14;s:29:"<0>CodeSourceLocation<0>endColumn";i:21;}}s:20:"<0>CodeGroupClause<0>key";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:7:"student";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:26;s:29:"<0>CodeSourceLocation<0>endColumn";i:33;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:8:"LastName";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:26;s:29:"<0>CodeSourceLocation<0>endColumn";i:43;}}s:31:"<0>CodeGroupClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:8;s:29:"<0>CodeSourceLocation<0>endColumn";i:43;}}s:30:"<0>CodeIntoClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:10;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:39;s:29:"<0>CodeSourceLocation<0>endColumn";i:43;}}s:35:"<0>CodeQueryExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:9;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:43;}}
-string(7) with \000 printed as <0>:
-closure
-ok
\ No newline at end of file
+string(4943) with \000 printed as <0>:
+O:19:"CodeQueryExpression":2:{s:28:"<0>CodeQueryExpression<0>clauses";V:9:"HH\Vector":3:{O:14:"CodeFromClause":3:{s:26:"<0>CodeFromClause<0>identifier";s:7:"student";s:26:"<0>CodeFromClause<0>collection";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:14:"@query_param_0";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:9;s:27:"<0>CodeSourceLocation<0>endLine";i:9;s:31:"<0>CodeSourceLocation<0>startColumn";i:23;s:29:"<0>CodeSourceLocation<0>endColumn";i:31;}}s:30:"<0>CodeFromClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:9;s:27:"<0>CodeSourceLocation<0>endLine";i:9;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:31;}}O:15:"CodeGroupClause":3:{s:27:"<0>CodeGroupClause<0>collection";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:7:"student";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:10;s:27:"<0>CodeSourceLocation<0>endLine";i:10;s:31:"<0>CodeSourceLocation<0>startColumn";i:12;s:29:"<0>CodeSourceLocation<0>endColumn";i:19;}}s:20:"<0>CodeGroupClause<0>key";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:7:"student";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:10;s:27:"<0>CodeSourceLocation<0>endLine";i:10;s:31:"<0>CodeSourceLocation<0>startColumn";i:24;s:29:"<0>CodeSourceLocation<0>endColumn";i:31;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:4:"Year";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:10;s:27:"<0>CodeSourceLocation<0>endLine";i:10;s:31:"<0>CodeSourceLocation<0>startColumn";i:24;s:29:"<0>CodeSourceLocation<0>endColumn";i:37;}}s:31:"<0>CodeGroupClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:10;s:27:"<0>CodeSourceLocation<0>endLine";i:10;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:37;}}O:14:"CodeIntoClause":3:{s:26:"<0>CodeIntoClause<0>identifier";s:5:"years";s:23:"<0>CodeIntoClause<0>clauses";V:9:"HH\Vector":2:{O:14:"CodeFromClause":3:{s:26:"<0>CodeFromClause<0>identifier";s:7:"student";s:26:"<0>CodeFromClause<0>collection";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:5:"years";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:25;s:29:"<0>CodeSourceLocation<0>endColumn";i:30;}}s:30:"<0>CodeFromClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:8;s:29:"<0>CodeSourceLocation<0>endColumn";i:30;}}O:15:"CodeGroupClause":3:{s:27:"<0>CodeGroupClause<0>collection";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:7:"student";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:14;s:29:"<0>CodeSourceLocation<0>endColumn";i:21;}}s:20:"<0>CodeGroupClause<0>key";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:7:"student";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:26;s:29:"<0>CodeSourceLocation<0>endColumn";i:33;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:8:"LastName";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:26;s:29:"<0>CodeSourceLocation<0>endColumn";i:43;}}s:31:"<0>CodeGroupClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:8;s:29:"<0>CodeSourceLocation<0>endColumn";i:43;}}}s:30:"<0>CodeIntoClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:10;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:39;s:29:"<0>CodeSourceLocation<0>endColumn";i:43;}}}s:35:"<0>CodeQueryExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:9;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:43;}}
+string(7) with \000 printed as <0>:
+closure
+ok
\ No newline at end of file
diff --git a/hphp/test/quick/phinq/into2.php.expect b/hphp/test/quick/phinq/into2.php.expect
dissimilarity index 95%
index 0d960f4d6c4..4fc66ae296b 100644
--- a/hphp/test/quick/phinq/into2.php.expect
+++ b/hphp/test/quick/phinq/into2.php.expect
@@ -1,5 +1,5 @@
-string(6724) with \000 printed as <0>:
-O:19:"CodeQueryExpression":2:{s:28:"<0>CodeQueryExpression<0>clauses";O:14:"CodeFromClause":3:{s:26:"<0>CodeFromClause<0>identifier";s:7:"student";s:26:"<0>CodeFromClause<0>collection";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:14:"@query_param_0";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:23;s:29:"<0>CodeSourceLocation<0>endColumn";i:34;}}s:30:"<0>CodeFromClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:34;}}O:15:"CodeGroupClause":3:{s:27:"<0>CodeGroupClause<0>collection";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:7:"student";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:12;s:29:"<0>CodeSourceLocation<0>endColumn";i:19;}}s:20:"<0>CodeGroupClause<0>key";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:7:"student";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:24;s:29:"<0>CodeSourceLocation<0>endColumn";i:31;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:4:"Year";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:24;s:29:"<0>CodeSourceLocation<0>endColumn";i:37;}}s:31:"<0>CodeGroupClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:37;}}O:14:"CodeIntoClause":3:{s:26:"<0>CodeIntoClause<0>identifier";s:5:"years";s:21:"<0>CodeIntoClause<0>query";O:14:"CodeFromClause":3:{s:26:"<0>CodeFromClause<0>identifier";s:7:"student";s:26:"<0>CodeFromClause<0>collection";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:5:"years";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:13;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:25;s:29:"<0>CodeSourceLocation<0>endColumn";i:30;}}s:30:"<0>CodeFromClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:13;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:8;s:29:"<0>CodeSourceLocation<0>endColumn";i:30;}}O:15:"CodeWhereClause":2:{s:26:"<0>CodeWhereClause<0>condition";O:22:"CodeBinaryOpExpression":4:{s:35:"<0>CodeBinaryOpExpression<0>expression1";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:7:"student";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:14;s:27:"<0>CodeSourceLocation<0>endLine";i:14;s:31:"<0>CodeSourceLocation<0>startColumn";i:14;s:29:"<0>CodeSourceLocation<0>endColumn";i:21;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:4:"Year";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:14;s:27:"<0>CodeSourceLocation<0>endLine";i:14;s:31:"<0>CodeSourceLocation<0>startColumn";i:14;s:29:"<0>CodeSourceLocation<0>endColumn";i:27;}}s:35:"<0>CodeBinaryOpExpression<0>expression2";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:14:"@query_param_1";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:14;s:27:"<0>CodeSourceLocation<0>endLine";i:14;s:31:"<0>CodeSourceLocation<0>startColumn";i:32;s:29:"<0>CodeSourceLocation<0>endColumn";i:40;}}s:33:"<0>CodeBinaryOpExpression<0>operation";i:14;s:38:"<0>CodeBinaryOpExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:14;s:27:"<0>CodeSourceLocation<0>endLine";i:14;s:31:"<0>CodeSourceLocation<0>startColumn";i:14;s:29:"<0>CodeSourceLocation<0>endColumn";i:40;}}s:31:"<0>CodeWhereClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:14;s:27:"<0>CodeSourceLocation<0>endLine";i:14;s:31:"<0>CodeSourceLocation<0>startColumn";i:8;s:29:"<0>CodeSourceLocation<0>endColumn";i:40;}}O:15:"CodeGroupClause":3:{s:27:"<0>CodeGroupClause<0>collection";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:7:"student";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:15;s:27:"<0>CodeSourceLocation<0>endLine";i:15;s:31:"<0>CodeSourceLocation<0>startColumn";i:14;s:29:"<0>CodeSourceLocation<0>endColumn";i:21;}}s:20:"<0>CodeGroupClause<0>key";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:7:"student";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:15;s:27:"<0>CodeSourceLocation<0>endLine";i:15;s:31:"<0>CodeSourceLocation<0>startColumn";i:26;s:29:"<0>CodeSourceLocation<0>endColumn";i:33;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:8:"LastName";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:15;s:27:"<0>CodeSourceLocation<0>endLine";i:15;s:31:"<0>CodeSourceLocation<0>startColumn";i:26;s:29:"<0>CodeSourceLocation<0>endColumn";i:43;}}s:31:"<0>CodeGroupClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:15;s:27:"<0>CodeSourceLocation<0>endLine";i:15;s:31:"<0>CodeSourceLocation<0>startColumn";i:8;s:29:"<0>CodeSourceLocation<0>endColumn";i:43;}}s:30:"<0>CodeIntoClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:15;s:31:"<0>CodeSourceLocation<0>startColumn";i:39;s:29:"<0>CodeSourceLocation<0>endColumn";i:43;}}s:35:"<0>CodeQueryExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:15;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:43;}}
-string(7) with \000 printed as <0>:
-closure
-int(3)
\ No newline at end of file
+string(6766) with \000 printed as <0>:
+O:19:"CodeQueryExpression":2:{s:28:"<0>CodeQueryExpression<0>clauses";V:9:"HH\Vector":3:{O:14:"CodeFromClause":3:{s:26:"<0>CodeFromClause<0>identifier";s:7:"student";s:26:"<0>CodeFromClause<0>collection";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:14:"@query_param_0";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:23;s:29:"<0>CodeSourceLocation<0>endColumn";i:34;}}s:30:"<0>CodeFromClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:34;}}O:15:"CodeGroupClause":3:{s:27:"<0>CodeGroupClause<0>collection";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:7:"student";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:12;s:29:"<0>CodeSourceLocation<0>endColumn";i:19;}}s:20:"<0>CodeGroupClause<0>key";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:7:"student";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:24;s:29:"<0>CodeSourceLocation<0>endColumn";i:31;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:4:"Year";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:24;s:29:"<0>CodeSourceLocation<0>endColumn";i:37;}}s:31:"<0>CodeGroupClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:37;}}O:14:"CodeIntoClause":3:{s:26:"<0>CodeIntoClause<0>identifier";s:5:"years";s:23:"<0>CodeIntoClause<0>clauses";V:9:"HH\Vector":3:{O:14:"CodeFromClause":3:{s:26:"<0>CodeFromClause<0>identifier";s:7:"student";s:26:"<0>CodeFromClause<0>collection";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:5:"years";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:13;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:25;s:29:"<0>CodeSourceLocation<0>endColumn";i:30;}}s:30:"<0>CodeFromClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:13;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:8;s:29:"<0>CodeSourceLocation<0>endColumn";i:30;}}O:15:"CodeWhereClause":2:{s:26:"<0>CodeWhereClause<0>condition";O:22:"CodeBinaryOpExpression":4:{s:35:"<0>CodeBinaryOpExpression<0>expression1";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:7:"student";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:14;s:27:"<0>CodeSourceLocation<0>endLine";i:14;s:31:"<0>CodeSourceLocation<0>startColumn";i:14;s:29:"<0>CodeSourceLocation<0>endColumn";i:21;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:4:"Year";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:14;s:27:"<0>CodeSourceLocation<0>endLine";i:14;s:31:"<0>CodeSourceLocation<0>startColumn";i:14;s:29:"<0>CodeSourceLocation<0>endColumn";i:27;}}s:35:"<0>CodeBinaryOpExpression<0>expression2";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:14:"@query_param_1";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:14;s:27:"<0>CodeSourceLocation<0>endLine";i:14;s:31:"<0>CodeSourceLocation<0>startColumn";i:32;s:29:"<0>CodeSourceLocation<0>endColumn";i:40;}}s:33:"<0>CodeBinaryOpExpression<0>operation";i:14;s:38:"<0>CodeBinaryOpExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:14;s:27:"<0>CodeSourceLocation<0>endLine";i:14;s:31:"<0>CodeSourceLocation<0>startColumn";i:14;s:29:"<0>CodeSourceLocation<0>endColumn";i:40;}}s:31:"<0>CodeWhereClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:14;s:27:"<0>CodeSourceLocation<0>endLine";i:14;s:31:"<0>CodeSourceLocation<0>startColumn";i:8;s:29:"<0>CodeSourceLocation<0>endColumn";i:40;}}O:15:"CodeGroupClause":3:{s:27:"<0>CodeGroupClause<0>collection";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:7:"student";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:15;s:27:"<0>CodeSourceLocation<0>endLine";i:15;s:31:"<0>CodeSourceLocation<0>startColumn";i:14;s:29:"<0>CodeSourceLocation<0>endColumn";i:21;}}s:20:"<0>CodeGroupClause<0>key";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:7:"student";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:15;s:27:"<0>CodeSourceLocation<0>endLine";i:15;s:31:"<0>CodeSourceLocation<0>startColumn";i:26;s:29:"<0>CodeSourceLocation<0>endColumn";i:33;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:8:"LastName";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:15;s:27:"<0>CodeSourceLocation<0>endLine";i:15;s:31:"<0>CodeSourceLocation<0>startColumn";i:26;s:29:"<0>CodeSourceLocation<0>endColumn";i:43;}}s:31:"<0>CodeGroupClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:15;s:27:"<0>CodeSourceLocation<0>endLine";i:15;s:31:"<0>CodeSourceLocation<0>startColumn";i:8;s:29:"<0>CodeSourceLocation<0>endColumn";i:43;}}}s:30:"<0>CodeIntoClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:15;s:31:"<0>CodeSourceLocation<0>startColumn";i:39;s:29:"<0>CodeSourceLocation<0>endColumn";i:43;}}}s:35:"<0>CodeQueryExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:15;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:43;}}
+string(7) with \000 printed as <0>:
+closure
+int(3)
\ No newline at end of file
diff --git a/hphp/test/quick/phinq/join1.php.expect b/hphp/test/quick/phinq/join1.php.expect
dissimilarity index 95%
index d5c83dffc04..36cb4e0dddd 100644
--- a/hphp/test/quick/phinq/join1.php.expect
+++ b/hphp/test/quick/phinq/join1.php.expect
@@ -1,5 +1,5 @@
-string(6220) with \000 printed as <0>:
-O:19:"CodeQueryExpression":2:{s:28:"<0>CodeQueryExpression<0>clauses";O:14:"CodeFromClause":3:{s:26:"<0>CodeFromClause<0>identifier";s:1:"c";s:26:"<0>CodeFromClause<0>collection";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:14:"@query_param_0";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:17;s:29:"<0>CodeSourceLocation<0>endColumn";i:26;}}s:30:"<0>CodeFromClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:26;}}O:14:"CodeJoinClause":5:{s:24:"<0>CodeJoinClause<0>variable";s:1:"o";s:26:"<0>CodeJoinClause<0>collection";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:6:"orders";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:17;s:29:"<0>CodeSourceLocation<0>endColumn";i:23;}}s:20:"<0>CodeJoinClause<0>left";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"c";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:28;s:29:"<0>CodeSourceLocation<0>endColumn";i:29;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:10:"CustomerID";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:28;s:29:"<0>CodeSourceLocation<0>endColumn";i:41;}}s:21:"<0>CodeJoinClause<0>right";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"o";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:50;s:29:"<0>CodeSourceLocation<0>endColumn";i:51;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:10:"CustomerID";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:50;s:29:"<0>CodeSourceLocation<0>endColumn";i:63;}}s:30:"<0>CodeJoinClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:63;}}O:16:"CodeSelectClause":2:{s:28:"<0>CodeSelectClause<0>expression";O:32:"CodeSimpleFunctionCallExpression":3:{s:46:"<0>CodeSimpleFunctionCallExpression<0>functionName";s:5:"tuple";s:43:"<0>CodeSimpleFunctionCallExpression<0>arguments";V:9:"HH\Vector":3:{O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"c";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:13;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:19;s:29:"<0>CodeSourceLocation<0>endColumn";i:20;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:4:"Name";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:13;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:19;s:29:"<0>CodeSourceLocation<0>endColumn";i:26;}}O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"o";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:13;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:29;s:29:"<0>CodeSourceLocation<0>endColumn";i:30;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:7:"OrderID";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:13;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:29;s:29:"<0>CodeSourceLocation<0>endColumn";i:39;}}O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"o";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:13;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:42;s:29:"<0>CodeSourceLocation<0>endColumn";i:43;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:5:"Total";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:13;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:42;s:29:"<0>CodeSourceLocation<0>endColumn";i:50;}}}s:48:"<0>CodeSimpleFunctionCallExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:13;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:13;s:29:"<0>CodeSourceLocation<0>endColumn";i:51;}}s:32:"<0>CodeSelectClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:13;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:51;}}s:35:"<0>CodeQueryExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:51;}}
-string(7) with \000 printed as <0>:
-closure
-ok
\ No newline at end of file
+string(6242) with \000 printed as <0>:
+O:19:"CodeQueryExpression":2:{s:28:"<0>CodeQueryExpression<0>clauses";V:9:"HH\Vector":3:{O:14:"CodeFromClause":3:{s:26:"<0>CodeFromClause<0>identifier";s:1:"c";s:26:"<0>CodeFromClause<0>collection";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:14:"@query_param_0";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:17;s:29:"<0>CodeSourceLocation<0>endColumn";i:26;}}s:30:"<0>CodeFromClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:26;}}O:14:"CodeJoinClause":5:{s:26:"<0>CodeJoinClause<0>identifier";s:1:"o";s:26:"<0>CodeJoinClause<0>collection";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:6:"orders";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:17;s:29:"<0>CodeSourceLocation<0>endColumn";i:23;}}s:20:"<0>CodeJoinClause<0>left";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"c";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:28;s:29:"<0>CodeSourceLocation<0>endColumn";i:29;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:10:"CustomerID";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:28;s:29:"<0>CodeSourceLocation<0>endColumn";i:41;}}s:21:"<0>CodeJoinClause<0>right";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"o";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:50;s:29:"<0>CodeSourceLocation<0>endColumn";i:51;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:10:"CustomerID";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:50;s:29:"<0>CodeSourceLocation<0>endColumn";i:63;}}s:30:"<0>CodeJoinClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:63;}}O:16:"CodeSelectClause":2:{s:28:"<0>CodeSelectClause<0>expression";O:32:"CodeSimpleFunctionCallExpression":3:{s:46:"<0>CodeSimpleFunctionCallExpression<0>functionName";s:5:"tuple";s:43:"<0>CodeSimpleFunctionCallExpression<0>arguments";V:9:"HH\Vector":3:{O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"c";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:13;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:19;s:29:"<0>CodeSourceLocation<0>endColumn";i:20;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:4:"Name";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:13;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:19;s:29:"<0>CodeSourceLocation<0>endColumn";i:26;}}O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"o";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:13;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:29;s:29:"<0>CodeSourceLocation<0>endColumn";i:30;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:7:"OrderID";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:13;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:29;s:29:"<0>CodeSourceLocation<0>endColumn";i:39;}}O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"o";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:13;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:42;s:29:"<0>CodeSourceLocation<0>endColumn";i:43;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:5:"Total";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:13;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:42;s:29:"<0>CodeSourceLocation<0>endColumn";i:50;}}}s:48:"<0>CodeSimpleFunctionCallExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:13;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:13;s:29:"<0>CodeSourceLocation<0>endColumn";i:51;}}s:32:"<0>CodeSelectClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:13;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:51;}}}s:35:"<0>CodeQueryExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:51;}}
+string(7) with \000 printed as <0>:
+closure
+ok
\ No newline at end of file
diff --git a/hphp/test/quick/phinq/join2.php.expect b/hphp/test/quick/phinq/join2.php.expect
dissimilarity index 93%
index 12e203e46e9..edb37daf8a4 100644
--- a/hphp/test/quick/phinq/join2.php.expect
+++ b/hphp/test/quick/phinq/join2.php.expect
@@ -1,5 +1,5 @@
-string(7602) with \000 printed as <0>:
-O:19:"CodeQueryExpression":2:{s:28:"<0>CodeQueryExpression<0>clauses";O:14:"CodeFromClause":3:{s:26:"<0>CodeFromClause<0>identifier";s:1:"c";s:26:"<0>CodeFromClause<0>collection";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:14:"@query_param_0";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:13;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:17;s:29:"<0>CodeSourceLocation<0>endColumn";i:26;}}s:30:"<0>CodeFromClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:13;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:26;}}O:14:"CodeJoinClause":6:{s:24:"<0>CodeJoinClause<0>variable";s:1:"o";s:26:"<0>CodeJoinClause<0>collection";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:6:"orders";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:14;s:27:"<0>CodeSourceLocation<0>endLine";i:14;s:31:"<0>CodeSourceLocation<0>startColumn";i:17;s:29:"<0>CodeSourceLocation<0>endColumn";i:23;}}s:20:"<0>CodeJoinClause<0>left";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"c";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:14;s:27:"<0>CodeSourceLocation<0>endLine";i:14;s:31:"<0>CodeSourceLocation<0>startColumn";i:28;s:29:"<0>CodeSourceLocation<0>endColumn";i:29;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:10:"CustomerID";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:14;s:27:"<0>CodeSourceLocation<0>endLine";i:14;s:31:"<0>CodeSourceLocation<0>startColumn";i:28;s:29:"<0>CodeSourceLocation<0>endColumn";i:41;}}s:21:"<0>CodeJoinClause<0>right";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"o";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:14;s:27:"<0>CodeSourceLocation<0>endLine";i:14;s:31:"<0>CodeSourceLocation<0>startColumn";i:50;s:29:"<0>CodeSourceLocation<0>endColumn";i:51;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:10:"CustomerID";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:14;s:27:"<0>CodeSourceLocation<0>endLine";i:14;s:31:"<0>CodeSourceLocation<0>startColumn";i:50;s:29:"<0>CodeSourceLocation<0>endColumn";i:63;}}s:21:"<0>CodeJoinClause<0>group";s:2:"co";s:30:"<0>CodeJoinClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:14;s:27:"<0>CodeSourceLocation<0>endLine";i:14;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:72;}}O:13:"CodeLetClause":3:{s:25:"<0>CodeLetClause<0>identifier";s:1:"n";s:25:"<0>CodeLetClause<0>expression";O:32:"CodeSimpleFunctionCallExpression":3:{s:46:"<0>CodeSimpleFunctionCallExpression<0>functionName";s:5:"count";s:43:"<0>CodeSimpleFunctionCallExpression<0>arguments";V:9:"HH\Vector":1:{O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:2:"co";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:15;s:27:"<0>CodeSourceLocation<0>endLine";i:15;s:31:"<0>CodeSourceLocation<0>startColumn";i:21;s:29:"<0>CodeSourceLocation<0>endColumn";i:23;}}}s:48:"<0>CodeSimpleFunctionCallExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:15;s:27:"<0>CodeSourceLocation<0>endLine";i:15;s:31:"<0>CodeSourceLocation<0>startColumn";i:15;s:29:"<0>CodeSourceLocation<0>endColumn";i:24;}}s:29:"<0>CodeLetClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:15;s:27:"<0>CodeSourceLocation<0>endLine";i:15;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:24;}}O:15:"CodeWhereClause":2:{s:26:"<0>CodeWhereClause<0>condition";O:22:"CodeBinaryOpExpression":4:{s:35:"<0>CodeBinaryOpExpression<0>expression1";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"n";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:16;s:27:"<0>CodeSourceLocation<0>endLine";i:16;s:31:"<0>CodeSourceLocation<0>startColumn";i:12;s:29:"<0>CodeSourceLocation<0>endColumn";i:13;}}s:35:"<0>CodeBinaryOpExpression<0>expression2";O:20:"CodeScalarExpression":2:{s:27:"<0>CodeScalarExpression<0>value";i:10;s:36:"<0>CodeScalarExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:16;s:27:"<0>CodeSourceLocation<0>endLine";i:16;s:31:"<0>CodeSourceLocation<0>startColumn";i:18;s:29:"<0>CodeSourceLocation<0>endColumn";i:19;}}s:33:"<0>CodeBinaryOpExpression<0>operation";i:16;s:38:"<0>CodeBinaryOpExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:16;s:27:"<0>CodeSourceLocation<0>endLine";i:16;s:31:"<0>CodeSourceLocation<0>startColumn";i:12;s:29:"<0>CodeSourceLocation<0>endColumn";i:19;}}s:31:"<0>CodeWhereClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:16;s:27:"<0>CodeSourceLocation<0>endLine";i:16;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:19;}}O:16:"CodeSelectClause":2:{s:28:"<0>CodeSelectClause<0>expression";O:32:"CodeSimpleFunctionCallExpression":3:{s:46:"<0>CodeSimpleFunctionCallExpression<0>functionName";s:5:"tuple";s:43:"<0>CodeSimpleFunctionCallExpression<0>arguments";V:9:"HH\Vector":2:{O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"c";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:17;s:27:"<0>CodeSourceLocation<0>endLine";i:17;s:31:"<0>CodeSourceLocation<0>startColumn";i:28;s:29:"<0>CodeSourceLocation<0>endColumn";i:29;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:4:"Name";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:17;s:27:"<0>CodeSourceLocation<0>endLine";i:17;s:31:"<0>CodeSourceLocation<0>startColumn";i:28;s:29:"<0>CodeSourceLocation<0>endColumn";i:35;}}O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"n";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:17;s:27:"<0>CodeSourceLocation<0>endLine";i:17;s:31:"<0>CodeSourceLocation<0>startColumn";i:54;s:29:"<0>CodeSourceLocation<0>endColumn";i:55;}}}s:48:"<0>CodeSimpleFunctionCallExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:17;s:27:"<0>CodeSourceLocation<0>endLine";i:17;s:31:"<0>CodeSourceLocation<0>startColumn";i:13;s:29:"<0>CodeSourceLocation<0>endColumn";i:57;}}s:32:"<0>CodeSelectClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:17;s:27:"<0>CodeSourceLocation<0>endLine";i:17;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:57;}}s:35:"<0>CodeQueryExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:13;s:27:"<0>CodeSourceLocation<0>endLine";i:17;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:57;}}
-string(7) with \000 printed as <0>:
-closure
-ok
\ No newline at end of file
+string(7624) with \000 printed as <0>:
+O:19:"CodeQueryExpression":2:{s:28:"<0>CodeQueryExpression<0>clauses";V:9:"HH\Vector":5:{O:14:"CodeFromClause":3:{s:26:"<0>CodeFromClause<0>identifier";s:1:"c";s:26:"<0>CodeFromClause<0>collection";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:14:"@query_param_0";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:13;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:17;s:29:"<0>CodeSourceLocation<0>endColumn";i:26;}}s:30:"<0>CodeFromClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:13;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:26;}}O:14:"CodeJoinClause":6:{s:26:"<0>CodeJoinClause<0>identifier";s:1:"o";s:26:"<0>CodeJoinClause<0>collection";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:6:"orders";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:14;s:27:"<0>CodeSourceLocation<0>endLine";i:14;s:31:"<0>CodeSourceLocation<0>startColumn";i:17;s:29:"<0>CodeSourceLocation<0>endColumn";i:23;}}s:20:"<0>CodeJoinClause<0>left";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"c";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:14;s:27:"<0>CodeSourceLocation<0>endLine";i:14;s:31:"<0>CodeSourceLocation<0>startColumn";i:28;s:29:"<0>CodeSourceLocation<0>endColumn";i:29;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:10:"CustomerID";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:14;s:27:"<0>CodeSourceLocation<0>endLine";i:14;s:31:"<0>CodeSourceLocation<0>startColumn";i:28;s:29:"<0>CodeSourceLocation<0>endColumn";i:41;}}s:21:"<0>CodeJoinClause<0>right";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"o";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:14;s:27:"<0>CodeSourceLocation<0>endLine";i:14;s:31:"<0>CodeSourceLocation<0>startColumn";i:50;s:29:"<0>CodeSourceLocation<0>endColumn";i:51;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:10:"CustomerID";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:14;s:27:"<0>CodeSourceLocation<0>endLine";i:14;s:31:"<0>CodeSourceLocation<0>startColumn";i:50;s:29:"<0>CodeSourceLocation<0>endColumn";i:63;}}s:21:"<0>CodeJoinClause<0>group";s:2:"co";s:30:"<0>CodeJoinClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:14;s:27:"<0>CodeSourceLocation<0>endLine";i:14;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:72;}}O:13:"CodeLetClause":3:{s:25:"<0>CodeLetClause<0>identifier";s:1:"n";s:25:"<0>CodeLetClause<0>expression";O:32:"CodeSimpleFunctionCallExpression":3:{s:46:"<0>CodeSimpleFunctionCallExpression<0>functionName";s:5:"count";s:43:"<0>CodeSimpleFunctionCallExpression<0>arguments";V:9:"HH\Vector":1:{O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:2:"co";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:15;s:27:"<0>CodeSourceLocation<0>endLine";i:15;s:31:"<0>CodeSourceLocation<0>startColumn";i:21;s:29:"<0>CodeSourceLocation<0>endColumn";i:23;}}}s:48:"<0>CodeSimpleFunctionCallExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:15;s:27:"<0>CodeSourceLocation<0>endLine";i:15;s:31:"<0>CodeSourceLocation<0>startColumn";i:15;s:29:"<0>CodeSourceLocation<0>endColumn";i:24;}}s:29:"<0>CodeLetClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:15;s:27:"<0>CodeSourceLocation<0>endLine";i:15;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:24;}}O:15:"CodeWhereClause":2:{s:26:"<0>CodeWhereClause<0>condition";O:22:"CodeBinaryOpExpression":4:{s:35:"<0>CodeBinaryOpExpression<0>expression1";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"n";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:16;s:27:"<0>CodeSourceLocation<0>endLine";i:16;s:31:"<0>CodeSourceLocation<0>startColumn";i:12;s:29:"<0>CodeSourceLocation<0>endColumn";i:13;}}s:35:"<0>CodeBinaryOpExpression<0>expression2";O:20:"CodeScalarExpression":2:{s:27:"<0>CodeScalarExpression<0>value";i:10;s:36:"<0>CodeScalarExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:16;s:27:"<0>CodeSourceLocation<0>endLine";i:16;s:31:"<0>CodeSourceLocation<0>startColumn";i:18;s:29:"<0>CodeSourceLocation<0>endColumn";i:19;}}s:33:"<0>CodeBinaryOpExpression<0>operation";i:16;s:38:"<0>CodeBinaryOpExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:16;s:27:"<0>CodeSourceLocation<0>endLine";i:16;s:31:"<0>CodeSourceLocation<0>startColumn";i:12;s:29:"<0>CodeSourceLocation<0>endColumn";i:19;}}s:31:"<0>CodeWhereClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:16;s:27:"<0>CodeSourceLocation<0>endLine";i:16;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:19;}}O:16:"CodeSelectClause":2:{s:28:"<0>CodeSelectClause<0>expression";O:32:"CodeSimpleFunctionCallExpression":3:{s:46:"<0>CodeSimpleFunctionCallExpression<0>functionName";s:5:"tuple";s:43:"<0>CodeSimpleFunctionCallExpression<0>arguments";V:9:"HH\Vector":2:{O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"c";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:17;s:27:"<0>CodeSourceLocation<0>endLine";i:17;s:31:"<0>CodeSourceLocation<0>startColumn";i:28;s:29:"<0>CodeSourceLocation<0>endColumn";i:29;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:4:"Name";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:17;s:27:"<0>CodeSourceLocation<0>endLine";i:17;s:31:"<0>CodeSourceLocation<0>startColumn";i:28;s:29:"<0>CodeSourceLocation<0>endColumn";i:35;}}O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"n";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:17;s:27:"<0>CodeSourceLocation<0>endLine";i:17;s:31:"<0>CodeSourceLocation<0>startColumn";i:54;s:29:"<0>CodeSourceLocation<0>endColumn";i:55;}}}s:48:"<0>CodeSimpleFunctionCallExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:17;s:27:"<0>CodeSourceLocation<0>endLine";i:17;s:31:"<0>CodeSourceLocation<0>startColumn";i:13;s:29:"<0>CodeSourceLocation<0>endColumn";i:57;}}s:32:"<0>CodeSelectClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:17;s:27:"<0>CodeSourceLocation<0>endLine";i:17;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:57;}}}s:35:"<0>CodeQueryExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:13;s:27:"<0>CodeSourceLocation<0>endLine";i:17;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:57;}}
+string(7) with \000 printed as <0>:
+closure
+ok
\ No newline at end of file
diff --git a/hphp/test/quick/phinq/join3.php.expect b/hphp/test/quick/phinq/join3.php.expect
dissimilarity index 86%
index 91278b69e0f..a402c2e4303 100644
--- a/hphp/test/quick/phinq/join3.php.expect
+++ b/hphp/test/quick/phinq/join3.php.expect
@@ -1,4 +1,4 @@
-string(10683) with \000 printed as <0>:
-O:19:"CodeQueryExpression":2:{s:28:"<0>CodeQueryExpression<0>clauses";O:14:"CodeFromClause":3:{s:26:"<0>CodeFromClause<0>identifier";s:1:"c";s:26:"<0>CodeFromClause<0>collection";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:14:"@query_param_0";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:7;s:27:"<0>CodeSourceLocation<0>endLine";i:7;s:31:"<0>CodeSourceLocation<0>startColumn";i:17;s:29:"<0>CodeSourceLocation<0>endColumn";i:26;}}s:30:"<0>CodeFromClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:7;s:27:"<0>CodeSourceLocation<0>endLine";i:7;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:26;}}O:14:"CodeJoinClause":5:{s:24:"<0>CodeJoinClause<0>variable";s:1:"o";s:26:"<0>CodeJoinClause<0>collection";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:6:"orders";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:8;s:27:"<0>CodeSourceLocation<0>endLine";i:8;s:31:"<0>CodeSourceLocation<0>startColumn";i:17;s:29:"<0>CodeSourceLocation<0>endColumn";i:23;}}s:20:"<0>CodeJoinClause<0>left";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"c";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:8;s:27:"<0>CodeSourceLocation<0>endLine";i:8;s:31:"<0>CodeSourceLocation<0>startColumn";i:28;s:29:"<0>CodeSourceLocation<0>endColumn";i:29;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:10:"CustomerID";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:8;s:27:"<0>CodeSourceLocation<0>endLine";i:8;s:31:"<0>CodeSourceLocation<0>startColumn";i:28;s:29:"<0>CodeSourceLocation<0>endColumn";i:41;}}s:21:"<0>CodeJoinClause<0>right";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"o";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:8;s:27:"<0>CodeSourceLocation<0>endLine";i:8;s:31:"<0>CodeSourceLocation<0>startColumn";i:50;s:29:"<0>CodeSourceLocation<0>endColumn";i:51;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:10:"CustomerID";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:8;s:27:"<0>CodeSourceLocation<0>endLine";i:8;s:31:"<0>CodeSourceLocation<0>startColumn";i:50;s:29:"<0>CodeSourceLocation<0>endColumn";i:63;}}s:30:"<0>CodeJoinClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:8;s:27:"<0>CodeSourceLocation<0>endLine";i:8;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:63;}}O:14:"CodeJoinClause":5:{s:24:"<0>CodeJoinClause<0>variable";s:1:"d";s:26:"<0>CodeJoinClause<0>collection";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:7:"details";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:9;s:27:"<0>CodeSourceLocation<0>endLine";i:9;s:31:"<0>CodeSourceLocation<0>startColumn";i:17;s:29:"<0>CodeSourceLocation<0>endColumn";i:24;}}s:20:"<0>CodeJoinClause<0>left";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"o";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:9;s:27:"<0>CodeSourceLocation<0>endLine";i:9;s:31:"<0>CodeSourceLocation<0>startColumn";i:29;s:29:"<0>CodeSourceLocation<0>endColumn";i:30;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:7:"OrderID";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:9;s:27:"<0>CodeSourceLocation<0>endLine";i:9;s:31:"<0>CodeSourceLocation<0>startColumn";i:29;s:29:"<0>CodeSourceLocation<0>endColumn";i:39;}}s:21:"<0>CodeJoinClause<0>right";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"d";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:9;s:27:"<0>CodeSourceLocation<0>endLine";i:9;s:31:"<0>CodeSourceLocation<0>startColumn";i:48;s:29:"<0>CodeSourceLocation<0>endColumn";i:49;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:7:"OrderID";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:9;s:27:"<0>CodeSourceLocation<0>endLine";i:9;s:31:"<0>CodeSourceLocation<0>startColumn";i:48;s:29:"<0>CodeSourceLocation<0>endColumn";i:58;}}s:30:"<0>CodeJoinClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:9;s:27:"<0>CodeSourceLocation<0>endLine";i:9;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:58;}}O:14:"CodeJoinClause":5:{s:24:"<0>CodeJoinClause<0>variable";s:1:"p";s:26:"<0>CodeJoinClause<0>collection";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:8:"products";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:10;s:27:"<0>CodeSourceLocation<0>endLine";i:10;s:31:"<0>CodeSourceLocation<0>startColumn";i:17;s:29:"<0>CodeSourceLocation<0>endColumn";i:25;}}s:20:"<0>CodeJoinClause<0>left";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"d";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:10;s:27:"<0>CodeSourceLocation<0>endLine";i:10;s:31:"<0>CodeSourceLocation<0>startColumn";i:30;s:29:"<0>CodeSourceLocation<0>endColumn";i:31;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:10:"ProductsID";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:10;s:27:"<0>CodeSourceLocation<0>endLine";i:10;s:31:"<0>CodeSourceLocation<0>startColumn";i:30;s:29:"<0>CodeSourceLocation<0>endColumn";i:43;}}s:21:"<0>CodeJoinClause<0>right";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"p";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:10;s:27:"<0>CodeSourceLocation<0>endLine";i:10;s:31:"<0>CodeSourceLocation<0>startColumn";i:52;s:29:"<0>CodeSourceLocation<0>endColumn";i:53;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:9:"ProductID";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:10;s:27:"<0>CodeSourceLocation<0>endLine";i:10;s:31:"<0>CodeSourceLocation<0>startColumn";i:52;s:29:"<0>CodeSourceLocation<0>endColumn";i:64;}}s:30:"<0>CodeJoinClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:10;s:27:"<0>CodeSourceLocation<0>endLine";i:10;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:64;}}O:16:"CodeSelectClause":2:{s:28:"<0>CodeSelectClause<0>expression";O:32:"CodeSimpleFunctionCallExpression":3:{s:46:"<0>CodeSimpleFunctionCallExpression<0>functionName";s:5:"tuple";s:43:"<0>CodeSimpleFunctionCallExpression<0>arguments";V:9:"HH\Vector":3:{O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"c";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:19;s:29:"<0>CodeSourceLocation<0>endColumn";i:20;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:4:"Name";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:19;s:29:"<0>CodeSourceLocation<0>endColumn";i:26;}}O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"o";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:29;s:29:"<0>CodeSourceLocation<0>endColumn";i:30;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:9:"OrderDate";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:29;s:29:"<0>CodeSourceLocation<0>endColumn";i:41;}}O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"p";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:44;s:29:"<0>CodeSourceLocation<0>endColumn";i:45;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:11:"ProductName";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:44;s:29:"<0>CodeSourceLocation<0>endColumn";i:58;}}}s:48:"<0>CodeSimpleFunctionCallExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:13;s:29:"<0>CodeSourceLocation<0>endColumn";i:59;}}s:32:"<0>CodeSelectClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:59;}}s:35:"<0>CodeQueryExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:7;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:59;}}
-string(7) with \000 printed as <0>:
-closure
\ No newline at end of file
+string(10709) with \000 printed as <0>:
+O:19:"CodeQueryExpression":2:{s:28:"<0>CodeQueryExpression<0>clauses";V:9:"HH\Vector":5:{O:14:"CodeFromClause":3:{s:26:"<0>CodeFromClause<0>identifier";s:1:"c";s:26:"<0>CodeFromClause<0>collection";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:14:"@query_param_0";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:7;s:27:"<0>CodeSourceLocation<0>endLine";i:7;s:31:"<0>CodeSourceLocation<0>startColumn";i:17;s:29:"<0>CodeSourceLocation<0>endColumn";i:26;}}s:30:"<0>CodeFromClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:7;s:27:"<0>CodeSourceLocation<0>endLine";i:7;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:26;}}O:14:"CodeJoinClause":5:{s:26:"<0>CodeJoinClause<0>identifier";s:1:"o";s:26:"<0>CodeJoinClause<0>collection";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:6:"orders";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:8;s:27:"<0>CodeSourceLocation<0>endLine";i:8;s:31:"<0>CodeSourceLocation<0>startColumn";i:17;s:29:"<0>CodeSourceLocation<0>endColumn";i:23;}}s:20:"<0>CodeJoinClause<0>left";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"c";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:8;s:27:"<0>CodeSourceLocation<0>endLine";i:8;s:31:"<0>CodeSourceLocation<0>startColumn";i:28;s:29:"<0>CodeSourceLocation<0>endColumn";i:29;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:10:"CustomerID";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:8;s:27:"<0>CodeSourceLocation<0>endLine";i:8;s:31:"<0>CodeSourceLocation<0>startColumn";i:28;s:29:"<0>CodeSourceLocation<0>endColumn";i:41;}}s:21:"<0>CodeJoinClause<0>right";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"o";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:8;s:27:"<0>CodeSourceLocation<0>endLine";i:8;s:31:"<0>CodeSourceLocation<0>startColumn";i:50;s:29:"<0>CodeSourceLocation<0>endColumn";i:51;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:10:"CustomerID";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:8;s:27:"<0>CodeSourceLocation<0>endLine";i:8;s:31:"<0>CodeSourceLocation<0>startColumn";i:50;s:29:"<0>CodeSourceLocation<0>endColumn";i:63;}}s:30:"<0>CodeJoinClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:8;s:27:"<0>CodeSourceLocation<0>endLine";i:8;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:63;}}O:14:"CodeJoinClause":5:{s:26:"<0>CodeJoinClause<0>identifier";s:1:"d";s:26:"<0>CodeJoinClause<0>collection";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:7:"details";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:9;s:27:"<0>CodeSourceLocation<0>endLine";i:9;s:31:"<0>CodeSourceLocation<0>startColumn";i:17;s:29:"<0>CodeSourceLocation<0>endColumn";i:24;}}s:20:"<0>CodeJoinClause<0>left";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"o";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:9;s:27:"<0>CodeSourceLocation<0>endLine";i:9;s:31:"<0>CodeSourceLocation<0>startColumn";i:29;s:29:"<0>CodeSourceLocation<0>endColumn";i:30;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:7:"OrderID";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:9;s:27:"<0>CodeSourceLocation<0>endLine";i:9;s:31:"<0>CodeSourceLocation<0>startColumn";i:29;s:29:"<0>CodeSourceLocation<0>endColumn";i:39;}}s:21:"<0>CodeJoinClause<0>right";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"d";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:9;s:27:"<0>CodeSourceLocation<0>endLine";i:9;s:31:"<0>CodeSourceLocation<0>startColumn";i:48;s:29:"<0>CodeSourceLocation<0>endColumn";i:49;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:7:"OrderID";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:9;s:27:"<0>CodeSourceLocation<0>endLine";i:9;s:31:"<0>CodeSourceLocation<0>startColumn";i:48;s:29:"<0>CodeSourceLocation<0>endColumn";i:58;}}s:30:"<0>CodeJoinClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:9;s:27:"<0>CodeSourceLocation<0>endLine";i:9;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:58;}}O:14:"CodeJoinClause":5:{s:26:"<0>CodeJoinClause<0>identifier";s:1:"p";s:26:"<0>CodeJoinClause<0>collection";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:8:"products";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:10;s:27:"<0>CodeSourceLocation<0>endLine";i:10;s:31:"<0>CodeSourceLocation<0>startColumn";i:17;s:29:"<0>CodeSourceLocation<0>endColumn";i:25;}}s:20:"<0>CodeJoinClause<0>left";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"d";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:10;s:27:"<0>CodeSourceLocation<0>endLine";i:10;s:31:"<0>CodeSourceLocation<0>startColumn";i:30;s:29:"<0>CodeSourceLocation<0>endColumn";i:31;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:10:"ProductsID";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:10;s:27:"<0>CodeSourceLocation<0>endLine";i:10;s:31:"<0>CodeSourceLocation<0>startColumn";i:30;s:29:"<0>CodeSourceLocation<0>endColumn";i:43;}}s:21:"<0>CodeJoinClause<0>right";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"p";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:10;s:27:"<0>CodeSourceLocation<0>endLine";i:10;s:31:"<0>CodeSourceLocation<0>startColumn";i:52;s:29:"<0>CodeSourceLocation<0>endColumn";i:53;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:9:"ProductID";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:10;s:27:"<0>CodeSourceLocation<0>endLine";i:10;s:31:"<0>CodeSourceLocation<0>startColumn";i:52;s:29:"<0>CodeSourceLocation<0>endColumn";i:64;}}s:30:"<0>CodeJoinClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:10;s:27:"<0>CodeSourceLocation<0>endLine";i:10;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:64;}}O:16:"CodeSelectClause":2:{s:28:"<0>CodeSelectClause<0>expression";O:32:"CodeSimpleFunctionCallExpression":3:{s:46:"<0>CodeSimpleFunctionCallExpression<0>functionName";s:5:"tuple";s:43:"<0>CodeSimpleFunctionCallExpression<0>arguments";V:9:"HH\Vector":3:{O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"c";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:19;s:29:"<0>CodeSourceLocation<0>endColumn";i:20;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:4:"Name";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:19;s:29:"<0>CodeSourceLocation<0>endColumn";i:26;}}O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"o";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:29;s:29:"<0>CodeSourceLocation<0>endColumn";i:30;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:9:"OrderDate";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:29;s:29:"<0>CodeSourceLocation<0>endColumn";i:41;}}O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"p";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:44;s:29:"<0>CodeSourceLocation<0>endColumn";i:45;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:11:"ProductName";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:44;s:29:"<0>CodeSourceLocation<0>endColumn";i:58;}}}s:48:"<0>CodeSimpleFunctionCallExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:13;s:29:"<0>CodeSourceLocation<0>endColumn";i:59;}}s:32:"<0>CodeSelectClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:59;}}}s:35:"<0>CodeQueryExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:7;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:59;}}
+string(7) with \000 printed as <0>:
+closure
\ No newline at end of file
diff --git a/hphp/test/quick/phinq/let1.php.expect b/hphp/test/quick/phinq/let1.php.expect
dissimilarity index 92%
index c81702e1228..1b6040dab5e 100644
--- a/hphp/test/quick/phinq/let1.php.expect
+++ b/hphp/test/quick/phinq/let1.php.expect
@@ -1,5 +1,5 @@
-string(7956) with \000 printed as <0>:
-O:19:"CodeQueryExpression":2:{s:28:"<0>CodeQueryExpression<0>clauses";O:14:"CodeFromClause":3:{s:26:"<0>CodeFromClause<0>identifier";s:1:"o";s:26:"<0>CodeFromClause<0>collection";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:14:"@query_param_0";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:9;s:27:"<0>CodeSourceLocation<0>endLine";i:9;s:31:"<0>CodeSourceLocation<0>startColumn";i:17;s:29:"<0>CodeSourceLocation<0>endColumn";i:23;}}s:30:"<0>CodeFromClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:9;s:27:"<0>CodeSourceLocation<0>endLine";i:9;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:23;}}O:14:"CodeFromClause":3:{s:26:"<0>CodeFromClause<0>identifier";s:1:"d";s:26:"<0>CodeFromClause<0>collection";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"o";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:10;s:27:"<0>CodeSourceLocation<0>endLine";i:10;s:31:"<0>CodeSourceLocation<0>startColumn";i:17;s:29:"<0>CodeSourceLocation<0>endColumn";i:18;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:7:"Details";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:10;s:27:"<0>CodeSourceLocation<0>endLine";i:10;s:31:"<0>CodeSourceLocation<0>startColumn";i:17;s:29:"<0>CodeSourceLocation<0>endColumn";i:27;}}s:30:"<0>CodeFromClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:10;s:27:"<0>CodeSourceLocation<0>endLine";i:10;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:27;}}O:13:"CodeLetClause":3:{s:25:"<0>CodeLetClause<0>identifier";s:1:"t";s:25:"<0>CodeLetClause<0>expression";O:32:"CodeSimpleFunctionCallExpression":3:{s:46:"<0>CodeSimpleFunctionCallExpression<0>functionName";s:3:"sum";s:43:"<0>CodeSimpleFunctionCallExpression<0>arguments";V:9:"HH\Vector":1:{O:22:"CodeBinaryOpExpression":4:{s:35:"<0>CodeBinaryOpExpression<0>expression1";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"d";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:19;s:29:"<0>CodeSourceLocation<0>endColumn";i:20;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:9:"UnitPrice";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:19;s:29:"<0>CodeSourceLocation<0>endColumn";i:31;}}s:35:"<0>CodeBinaryOpExpression<0>expression2";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"d";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:35;s:29:"<0>CodeSourceLocation<0>endColumn";i:36;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:8:"Quantity";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:35;s:29:"<0>CodeSourceLocation<0>endColumn";i:46;}}s:33:"<0>CodeBinaryOpExpression<0>operation";i:30;s:38:"<0>CodeBinaryOpExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:19;s:29:"<0>CodeSourceLocation<0>endColumn";i:46;}}}s:48:"<0>CodeSimpleFunctionCallExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:15;s:29:"<0>CodeSourceLocation<0>endColumn";i:47;}}s:29:"<0>CodeLetClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:47;}}O:15:"CodeWhereClause":2:{s:26:"<0>CodeWhereClause<0>condition";O:22:"CodeBinaryOpExpression":4:{s:35:"<0>CodeBinaryOpExpression<0>expression1";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"t";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:12;s:29:"<0>CodeSourceLocation<0>endColumn";i:13;}}s:35:"<0>CodeBinaryOpExpression<0>expression2";O:20:"CodeScalarExpression":2:{s:27:"<0>CodeScalarExpression<0>value";i:1000;s:36:"<0>CodeScalarExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:18;s:29:"<0>CodeSourceLocation<0>endColumn";i:21;}}s:33:"<0>CodeBinaryOpExpression<0>operation";i:16;s:38:"<0>CodeBinaryOpExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:12;s:29:"<0>CodeSourceLocation<0>endColumn";i:21;}}s:31:"<0>CodeWhereClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:21;}}O:16:"CodeSelectClause":2:{s:28:"<0>CodeSelectClause<0>expression";O:32:"CodeSimpleFunctionCallExpression":3:{s:46:"<0>CodeSimpleFunctionCallExpression<0>functionName";s:5:"tuple";s:43:"<0>CodeSimpleFunctionCallExpression<0>arguments";V:9:"HH\Vector":2:{O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"o";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:13;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:31;s:29:"<0>CodeSourceLocation<0>endColumn";i:32;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:7:"OrderID";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:13;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:31;s:29:"<0>CodeSourceLocation<0>endColumn";i:41;}}O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"t";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:13;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:55;s:29:"<0>CodeSourceLocation<0>endColumn";i:56;}}}s:48:"<0>CodeSimpleFunctionCallExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:13;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:13;s:29:"<0>CodeSourceLocation<0>endColumn";i:58;}}s:32:"<0>CodeSelectClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:13;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:58;}}s:35:"<0>CodeQueryExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:9;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:58;}}
-string(7) with \000 printed as <0>:
-closure
-ok
\ No newline at end of file
+string(7976) with \000 printed as <0>:
+O:19:"CodeQueryExpression":2:{s:28:"<0>CodeQueryExpression<0>clauses";V:9:"HH\Vector":5:{O:14:"CodeFromClause":3:{s:26:"<0>CodeFromClause<0>identifier";s:1:"o";s:26:"<0>CodeFromClause<0>collection";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:14:"@query_param_0";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:9;s:27:"<0>CodeSourceLocation<0>endLine";i:9;s:31:"<0>CodeSourceLocation<0>startColumn";i:17;s:29:"<0>CodeSourceLocation<0>endColumn";i:23;}}s:30:"<0>CodeFromClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:9;s:27:"<0>CodeSourceLocation<0>endLine";i:9;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:23;}}O:14:"CodeFromClause":3:{s:26:"<0>CodeFromClause<0>identifier";s:1:"d";s:26:"<0>CodeFromClause<0>collection";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"o";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:10;s:27:"<0>CodeSourceLocation<0>endLine";i:10;s:31:"<0>CodeSourceLocation<0>startColumn";i:17;s:29:"<0>CodeSourceLocation<0>endColumn";i:18;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:7:"Details";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:10;s:27:"<0>CodeSourceLocation<0>endLine";i:10;s:31:"<0>CodeSourceLocation<0>startColumn";i:17;s:29:"<0>CodeSourceLocation<0>endColumn";i:27;}}s:30:"<0>CodeFromClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:10;s:27:"<0>CodeSourceLocation<0>endLine";i:10;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:27;}}O:13:"CodeLetClause":3:{s:25:"<0>CodeLetClause<0>identifier";s:1:"t";s:25:"<0>CodeLetClause<0>expression";O:32:"CodeSimpleFunctionCallExpression":3:{s:46:"<0>CodeSimpleFunctionCallExpression<0>functionName";s:3:"sum";s:43:"<0>CodeSimpleFunctionCallExpression<0>arguments";V:9:"HH\Vector":1:{O:22:"CodeBinaryOpExpression":4:{s:35:"<0>CodeBinaryOpExpression<0>expression1";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"d";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:19;s:29:"<0>CodeSourceLocation<0>endColumn";i:20;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:9:"UnitPrice";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:19;s:29:"<0>CodeSourceLocation<0>endColumn";i:31;}}s:35:"<0>CodeBinaryOpExpression<0>expression2";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"d";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:35;s:29:"<0>CodeSourceLocation<0>endColumn";i:36;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:8:"Quantity";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:35;s:29:"<0>CodeSourceLocation<0>endColumn";i:46;}}s:33:"<0>CodeBinaryOpExpression<0>operation";i:30;s:38:"<0>CodeBinaryOpExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:19;s:29:"<0>CodeSourceLocation<0>endColumn";i:46;}}}s:48:"<0>CodeSimpleFunctionCallExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:15;s:29:"<0>CodeSourceLocation<0>endColumn";i:47;}}s:29:"<0>CodeLetClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:47;}}O:15:"CodeWhereClause":2:{s:26:"<0>CodeWhereClause<0>condition";O:22:"CodeBinaryOpExpression":4:{s:35:"<0>CodeBinaryOpExpression<0>expression1";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"t";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:12;s:29:"<0>CodeSourceLocation<0>endColumn";i:13;}}s:35:"<0>CodeBinaryOpExpression<0>expression2";O:20:"CodeScalarExpression":2:{s:27:"<0>CodeScalarExpression<0>value";i:1000;s:36:"<0>CodeScalarExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:18;s:29:"<0>CodeSourceLocation<0>endColumn";i:21;}}s:33:"<0>CodeBinaryOpExpression<0>operation";i:16;s:38:"<0>CodeBinaryOpExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:12;s:29:"<0>CodeSourceLocation<0>endColumn";i:21;}}s:31:"<0>CodeWhereClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:21;}}O:16:"CodeSelectClause":2:{s:28:"<0>CodeSelectClause<0>expression";O:32:"CodeSimpleFunctionCallExpression":3:{s:46:"<0>CodeSimpleFunctionCallExpression<0>functionName";s:5:"tuple";s:43:"<0>CodeSimpleFunctionCallExpression<0>arguments";V:9:"HH\Vector":2:{O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"o";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:13;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:31;s:29:"<0>CodeSourceLocation<0>endColumn";i:32;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:7:"OrderID";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:13;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:31;s:29:"<0>CodeSourceLocation<0>endColumn";i:41;}}O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"t";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:13;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:55;s:29:"<0>CodeSourceLocation<0>endColumn";i:56;}}}s:48:"<0>CodeSimpleFunctionCallExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:13;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:13;s:29:"<0>CodeSourceLocation<0>endColumn";i:58;}}s:32:"<0>CodeSelectClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:13;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:58;}}}s:35:"<0>CodeQueryExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:9;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:58;}}
+string(7) with \000 printed as <0>:
+closure
+ok
\ No newline at end of file
diff --git a/hphp/test/quick/phinq/orderby1.php.expect b/hphp/test/quick/phinq/orderby1.php.expect
dissimilarity index 88%
index 7f1bbe84ff4..67734eecc8d 100644
--- a/hphp/test/quick/phinq/orderby1.php.expect
+++ b/hphp/test/quick/phinq/orderby1.php.expect
@@ -1,5 +1,5 @@
-string(6420) with \000 printed as <0>:
-O:19:"CodeQueryExpression":2:{s:28:"<0>CodeQueryExpression<0>clauses";O:14:"CodeFromClause":3:{s:26:"<0>CodeFromClause<0>identifier";s:1:"c";s:26:"<0>CodeFromClause<0>collection";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:14:"@query_param_0";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:17;s:29:"<0>CodeSourceLocation<0>endColumn";i:26;}}s:30:"<0>CodeFromClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:26;}}O:14:"CodeFromClause":3:{s:26:"<0>CodeFromClause<0>identifier";s:1:"o";s:26:"<0>CodeFromClause<0>collection";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"c";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:17;s:29:"<0>CodeSourceLocation<0>endColumn";i:18;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:6:"Orders";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:17;s:29:"<0>CodeSourceLocation<0>endColumn";i:26;}}s:30:"<0>CodeFromClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:26;}}O:17:"CodeOrderbyClause":2:{s:26:"<0>CodeOrderbyClause<0>clauses";O:12:"CodeOrdering":3:{s:17:"<0>CodeOrdering<0>key";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"o";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:13;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:14;s:29:"<0>CodeSourceLocation<0>endColumn";i:15;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:5:"Total";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:13;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:14;s:29:"<0>CodeSourceLocation<0>endColumn";i:22;}}s:23:"<0>CodeOrdering<0>direction";i:3;s:28:"<0>CodeOrdering<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:13;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:14;s:29:"<0>CodeSourceLocation<0>endColumn";i:33;}}s:33:"<0>CodeOrderbyClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:13;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:33;}}O:16:"CodeSelectClause":2:{s:28:"<0>CodeSelectClause<0>expression";O:32:"CodeSimpleFunctionCallExpression":3:{s:46:"<0>CodeSimpleFunctionCallExpression<0>functionName";s:5:"tuple";s:43:"<0>CodeSimpleFunctionCallExpression<0>arguments";V:9:"HH\Vector":3:{O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"c";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:14;s:27:"<0>CodeSourceLocation<0>endLine";i:14;s:31:"<0>CodeSourceLocation<0>startColumn";i:19;s:29:"<0>CodeSourceLocation<0>endColumn";i:20;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:4:"Name";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:14;s:27:"<0>CodeSourceLocation<0>endLine";i:14;s:31:"<0>CodeSourceLocation<0>startColumn";i:19;s:29:"<0>CodeSourceLocation<0>endColumn";i:26;}}O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"o";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:14;s:27:"<0>CodeSourceLocation<0>endLine";i:14;s:31:"<0>CodeSourceLocation<0>startColumn";i:29;s:29:"<0>CodeSourceLocation<0>endColumn";i:30;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:7:"OrderID";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:14;s:27:"<0>CodeSourceLocation<0>endLine";i:14;s:31:"<0>CodeSourceLocation<0>startColumn";i:29;s:29:"<0>CodeSourceLocation<0>endColumn";i:39;}}O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"o";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:14;s:27:"<0>CodeSourceLocation<0>endLine";i:14;s:31:"<0>CodeSourceLocation<0>startColumn";i:42;s:29:"<0>CodeSourceLocation<0>endColumn";i:43;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:5:"Total";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:14;s:27:"<0>CodeSourceLocation<0>endLine";i:14;s:31:"<0>CodeSourceLocation<0>startColumn";i:42;s:29:"<0>CodeSourceLocation<0>endColumn";i:50;}}}s:48:"<0>CodeSimpleFunctionCallExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:14;s:27:"<0>CodeSourceLocation<0>endLine";i:14;s:31:"<0>CodeSourceLocation<0>startColumn";i:13;s:29:"<0>CodeSourceLocation<0>endColumn";i:51;}}s:32:"<0>CodeSelectClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:14;s:27:"<0>CodeSourceLocation<0>endLine";i:14;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:51;}}s:35:"<0>CodeQueryExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:14;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:51;}}
-string(7) with \000 printed as <0>:
-closure
-ok
\ No newline at end of file
+string(6462) with \000 printed as <0>:
+O:19:"CodeQueryExpression":2:{s:28:"<0>CodeQueryExpression<0>clauses";V:9:"HH\Vector":4:{O:14:"CodeFromClause":3:{s:26:"<0>CodeFromClause<0>identifier";s:1:"c";s:26:"<0>CodeFromClause<0>collection";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:14:"@query_param_0";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:17;s:29:"<0>CodeSourceLocation<0>endColumn";i:26;}}s:30:"<0>CodeFromClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:26;}}O:14:"CodeFromClause":3:{s:26:"<0>CodeFromClause<0>identifier";s:1:"o";s:26:"<0>CodeFromClause<0>collection";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"c";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:17;s:29:"<0>CodeSourceLocation<0>endColumn";i:18;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:6:"Orders";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:17;s:29:"<0>CodeSourceLocation<0>endColumn";i:26;}}s:30:"<0>CodeFromClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:26;}}O:17:"CodeOrderbyClause":2:{s:25:"<0>CodeOrderbyClause<0>orders";V:9:"HH\Vector":1:{O:12:"CodeOrdering":3:{s:24:"<0>CodeOrdering<0>expression";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"o";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:13;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:14;s:29:"<0>CodeSourceLocation<0>endColumn";i:15;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:5:"Total";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:13;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:14;s:29:"<0>CodeSourceLocation<0>endColumn";i:22;}}s:19:"<0>CodeOrdering<0>order";i:3;s:28:"<0>CodeOrdering<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:13;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:14;s:29:"<0>CodeSourceLocation<0>endColumn";i:33;}}}s:33:"<0>CodeOrderbyClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:13;s:27:"<0>CodeSourceLocation<0>endLine";i:13;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:33;}}O:16:"CodeSelectClause":2:{s:28:"<0>CodeSelectClause<0>expression";O:32:"CodeSimpleFunctionCallExpression":3:{s:46:"<0>CodeSimpleFunctionCallExpression<0>functionName";s:5:"tuple";s:43:"<0>CodeSimpleFunctionCallExpression<0>arguments";V:9:"HH\Vector":3:{O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"c";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:14;s:27:"<0>CodeSourceLocation<0>endLine";i:14;s:31:"<0>CodeSourceLocation<0>startColumn";i:19;s:29:"<0>CodeSourceLocation<0>endColumn";i:20;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:4:"Name";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:14;s:27:"<0>CodeSourceLocation<0>endLine";i:14;s:31:"<0>CodeSourceLocation<0>startColumn";i:19;s:29:"<0>CodeSourceLocation<0>endColumn";i:26;}}O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"o";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:14;s:27:"<0>CodeSourceLocation<0>endLine";i:14;s:31:"<0>CodeSourceLocation<0>startColumn";i:29;s:29:"<0>CodeSourceLocation<0>endColumn";i:30;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:7:"OrderID";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:14;s:27:"<0>CodeSourceLocation<0>endLine";i:14;s:31:"<0>CodeSourceLocation<0>startColumn";i:29;s:29:"<0>CodeSourceLocation<0>endColumn";i:39;}}O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"o";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:14;s:27:"<0>CodeSourceLocation<0>endLine";i:14;s:31:"<0>CodeSourceLocation<0>startColumn";i:42;s:29:"<0>CodeSourceLocation<0>endColumn";i:43;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:5:"Total";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:14;s:27:"<0>CodeSourceLocation<0>endLine";i:14;s:31:"<0>CodeSourceLocation<0>startColumn";i:42;s:29:"<0>CodeSourceLocation<0>endColumn";i:50;}}}s:48:"<0>CodeSimpleFunctionCallExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:14;s:27:"<0>CodeSourceLocation<0>endLine";i:14;s:31:"<0>CodeSourceLocation<0>startColumn";i:13;s:29:"<0>CodeSourceLocation<0>endColumn";i:51;}}s:32:"<0>CodeSelectClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:14;s:27:"<0>CodeSourceLocation<0>endLine";i:14;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:51;}}}s:35:"<0>CodeQueryExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:14;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:51;}}
+string(7) with \000 printed as <0>:
+closure
+ok
\ No newline at end of file
diff --git a/hphp/test/quick/phinq/orderby2.php.expect b/hphp/test/quick/phinq/orderby2.php.expect
dissimilarity index 96%
index b3385903a36..d4ee7ab5ad1 100644
--- a/hphp/test/quick/phinq/orderby2.php.expect
+++ b/hphp/test/quick/phinq/orderby2.php.expect
@@ -1,8 +1,8 @@
-string(4885) with \000 printed as <0>:
-O:19:"CodeQueryExpression":2:{s:28:"<0>CodeQueryExpression<0>clauses";O:14:"CodeFromClause":3:{s:26:"<0>CodeFromClause<0>identifier";s:1:"o";s:26:"<0>CodeFromClause<0>collection";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:14:"@query_param_0";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:7;s:27:"<0>CodeSourceLocation<0>endLine";i:7;s:31:"<0>CodeSourceLocation<0>startColumn";i:17;s:29:"<0>CodeSourceLocation<0>endColumn";i:23;}}s:30:"<0>CodeFromClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:7;s:27:"<0>CodeSourceLocation<0>endLine";i:7;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:23;}}O:17:"CodeOrderbyClause":2:{s:26:"<0>CodeOrderbyClause<0>clauses";O:12:"CodeOrdering":3:{s:17:"<0>CodeOrdering<0>key";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"o";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:8;s:27:"<0>CodeSourceLocation<0>endLine";i:8;s:31:"<0>CodeSourceLocation<0>startColumn";i:14;s:29:"<0>CodeSourceLocation<0>endColumn";i:15;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:8:"Customer";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:8;s:27:"<0>CodeSourceLocation<0>endLine";i:8;s:31:"<0>CodeSourceLocation<0>startColumn";i:14;s:29:"<0>CodeSourceLocation<0>endColumn";i:25;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:4:"Name";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:8;s:27:"<0>CodeSourceLocation<0>endLine";i:8;s:31:"<0>CodeSourceLocation<0>startColumn";i:14;s:29:"<0>CodeSourceLocation<0>endColumn";i:31;}}s:23:"<0>CodeOrdering<0>direction";i:3;s:28:"<0>CodeOrdering<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:8;s:27:"<0>CodeSourceLocation<0>endLine";i:8;s:31:"<0>CodeSourceLocation<0>startColumn";i:14;s:29:"<0>CodeSourceLocation<0>endColumn";i:31;}}O:12:"CodeOrdering":3:{s:17:"<0>CodeOrdering<0>key";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"o";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:8;s:27:"<0>CodeSourceLocation<0>endLine";i:8;s:31:"<0>CodeSourceLocation<0>startColumn";i:34;s:29:"<0>CodeSourceLocation<0>endColumn";i:35;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:5:"Total";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:8;s:27:"<0>CodeSourceLocation<0>endLine";i:8;s:31:"<0>CodeSourceLocation<0>startColumn";i:34;s:29:"<0>CodeSourceLocation<0>endColumn";i:42;}}s:23:"<0>CodeOrdering<0>direction";i:3;s:28:"<0>CodeOrdering<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:8;s:27:"<0>CodeSourceLocation<0>endLine";i:8;s:31:"<0>CodeSourceLocation<0>startColumn";i:34;s:29:"<0>CodeSourceLocation<0>endColumn";i:52;}}s:33:"<0>CodeOrderbyClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:8;s:27:"<0>CodeSourceLocation<0>endLine";i:8;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:52;}}O:16:"CodeSelectClause":2:{s:28:"<0>CodeSelectClause<0>expression";O:32:"CodeSimpleFunctionCallExpression":3:{s:46:"<0>CodeSimpleFunctionCallExpression<0>functionName";s:5:"tuple";s:43:"<0>CodeSimpleFunctionCallExpression<0>arguments";V:9:"HH\Vector":1:{O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"o";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:9;s:27:"<0>CodeSourceLocation<0>endLine";i:9;s:31:"<0>CodeSourceLocation<0>startColumn";i:13;s:29:"<0>CodeSourceLocation<0>endColumn";i:14;}}}s:48:"<0>CodeSimpleFunctionCallExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:9;s:27:"<0>CodeSourceLocation<0>endLine";i:9;s:31:"<0>CodeSourceLocation<0>startColumn";i:13;s:29:"<0>CodeSourceLocation<0>endColumn";i:14;}}s:32:"<0>CodeSelectClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:9;s:27:"<0>CodeSourceLocation<0>endLine";i:9;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:14;}}s:35:"<0>CodeQueryExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:7;s:27:"<0>CodeSourceLocation<0>endLine";i:9;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:14;}}
-string(7) with \000 printed as <0>:
-closure
-string(4885) with \000 printed as <0>:
-O:19:"CodeQueryExpression":2:{s:28:"<0>CodeQueryExpression<0>clauses";O:14:"CodeFromClause":3:{s:26:"<0>CodeFromClause<0>identifier";s:1:"o";s:26:"<0>CodeFromClause<0>collection";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:14:"@query_param_0";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:7;s:27:"<0>CodeSourceLocation<0>endLine";i:7;s:31:"<0>CodeSourceLocation<0>startColumn";i:17;s:29:"<0>CodeSourceLocation<0>endColumn";i:23;}}s:30:"<0>CodeFromClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:7;s:27:"<0>CodeSourceLocation<0>endLine";i:7;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:23;}}O:17:"CodeOrderbyClause":2:{s:26:"<0>CodeOrderbyClause<0>clauses";O:12:"CodeOrdering":3:{s:17:"<0>CodeOrdering<0>key";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"o";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:8;s:27:"<0>CodeSourceLocation<0>endLine";i:8;s:31:"<0>CodeSourceLocation<0>startColumn";i:14;s:29:"<0>CodeSourceLocation<0>endColumn";i:15;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:8:"Customer";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:8;s:27:"<0>CodeSourceLocation<0>endLine";i:8;s:31:"<0>CodeSourceLocation<0>startColumn";i:14;s:29:"<0>CodeSourceLocation<0>endColumn";i:25;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:4:"Name";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:8;s:27:"<0>CodeSourceLocation<0>endLine";i:8;s:31:"<0>CodeSourceLocation<0>startColumn";i:14;s:29:"<0>CodeSourceLocation<0>endColumn";i:31;}}s:23:"<0>CodeOrdering<0>direction";i:3;s:28:"<0>CodeOrdering<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:8;s:27:"<0>CodeSourceLocation<0>endLine";i:8;s:31:"<0>CodeSourceLocation<0>startColumn";i:14;s:29:"<0>CodeSourceLocation<0>endColumn";i:31;}}O:12:"CodeOrdering":3:{s:17:"<0>CodeOrdering<0>key";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"o";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:8;s:27:"<0>CodeSourceLocation<0>endLine";i:8;s:31:"<0>CodeSourceLocation<0>startColumn";i:34;s:29:"<0>CodeSourceLocation<0>endColumn";i:35;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:5:"Total";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:8;s:27:"<0>CodeSourceLocation<0>endLine";i:8;s:31:"<0>CodeSourceLocation<0>startColumn";i:34;s:29:"<0>CodeSourceLocation<0>endColumn";i:42;}}s:23:"<0>CodeOrdering<0>direction";i:3;s:28:"<0>CodeOrdering<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:8;s:27:"<0>CodeSourceLocation<0>endLine";i:8;s:31:"<0>CodeSourceLocation<0>startColumn";i:34;s:29:"<0>CodeSourceLocation<0>endColumn";i:52;}}s:33:"<0>CodeOrderbyClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:8;s:27:"<0>CodeSourceLocation<0>endLine";i:8;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:52;}}O:16:"CodeSelectClause":2:{s:28:"<0>CodeSelectClause<0>expression";O:32:"CodeSimpleFunctionCallExpression":3:{s:46:"<0>CodeSimpleFunctionCallExpression<0>functionName";s:5:"tuple";s:43:"<0>CodeSimpleFunctionCallExpression<0>arguments";V:9:"HH\Vector":1:{O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"o";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:9;s:27:"<0>CodeSourceLocation<0>endLine";i:9;s:31:"<0>CodeSourceLocation<0>startColumn";i:13;s:29:"<0>CodeSourceLocation<0>endColumn";i:14;}}}s:48:"<0>CodeSimpleFunctionCallExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:9;s:27:"<0>CodeSourceLocation<0>endLine";i:9;s:31:"<0>CodeSourceLocation<0>startColumn";i:13;s:29:"<0>CodeSourceLocation<0>endColumn";i:14;}}s:32:"<0>CodeSelectClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:9;s:27:"<0>CodeSourceLocation<0>endLine";i:9;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:14;}}s:35:"<0>CodeQueryExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:7;s:27:"<0>CodeSourceLocation<0>endLine";i:9;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:14;}}
-string(7) with \000 printed as <0>:
-closure
\ No newline at end of file
+string(4930) with \000 printed as <0>:
+O:19:"CodeQueryExpression":2:{s:28:"<0>CodeQueryExpression<0>clauses";V:9:"HH\Vector":3:{O:14:"CodeFromClause":3:{s:26:"<0>CodeFromClause<0>identifier";s:1:"o";s:26:"<0>CodeFromClause<0>collection";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:14:"@query_param_0";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:7;s:27:"<0>CodeSourceLocation<0>endLine";i:7;s:31:"<0>CodeSourceLocation<0>startColumn";i:17;s:29:"<0>CodeSourceLocation<0>endColumn";i:23;}}s:30:"<0>CodeFromClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:7;s:27:"<0>CodeSourceLocation<0>endLine";i:7;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:23;}}O:17:"CodeOrderbyClause":2:{s:25:"<0>CodeOrderbyClause<0>orders";V:9:"HH\Vector":2:{O:12:"CodeOrdering":3:{s:24:"<0>CodeOrdering<0>expression";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"o";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:8;s:27:"<0>CodeSourceLocation<0>endLine";i:8;s:31:"<0>CodeSourceLocation<0>startColumn";i:14;s:29:"<0>CodeSourceLocation<0>endColumn";i:15;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:8:"Customer";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:8;s:27:"<0>CodeSourceLocation<0>endLine";i:8;s:31:"<0>CodeSourceLocation<0>startColumn";i:14;s:29:"<0>CodeSourceLocation<0>endColumn";i:25;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:4:"Name";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:8;s:27:"<0>CodeSourceLocation<0>endLine";i:8;s:31:"<0>CodeSourceLocation<0>startColumn";i:14;s:29:"<0>CodeSourceLocation<0>endColumn";i:31;}}s:19:"<0>CodeOrdering<0>order";i:1;s:28:"<0>CodeOrdering<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:8;s:27:"<0>CodeSourceLocation<0>endLine";i:8;s:31:"<0>CodeSourceLocation<0>startColumn";i:14;s:29:"<0>CodeSourceLocation<0>endColumn";i:31;}}O:12:"CodeOrdering":3:{s:24:"<0>CodeOrdering<0>expression";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"o";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:8;s:27:"<0>CodeSourceLocation<0>endLine";i:8;s:31:"<0>CodeSourceLocation<0>startColumn";i:34;s:29:"<0>CodeSourceLocation<0>endColumn";i:35;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:5:"Total";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:8;s:27:"<0>CodeSourceLocation<0>endLine";i:8;s:31:"<0>CodeSourceLocation<0>startColumn";i:34;s:29:"<0>CodeSourceLocation<0>endColumn";i:42;}}s:19:"<0>CodeOrdering<0>order";i:2;s:28:"<0>CodeOrdering<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:8;s:27:"<0>CodeSourceLocation<0>endLine";i:8;s:31:"<0>CodeSourceLocation<0>startColumn";i:34;s:29:"<0>CodeSourceLocation<0>endColumn";i:52;}}}s:33:"<0>CodeOrderbyClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:8;s:27:"<0>CodeSourceLocation<0>endLine";i:8;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:52;}}O:16:"CodeSelectClause":2:{s:28:"<0>CodeSelectClause<0>expression";O:32:"CodeSimpleFunctionCallExpression":3:{s:46:"<0>CodeSimpleFunctionCallExpression<0>functionName";s:5:"tuple";s:43:"<0>CodeSimpleFunctionCallExpression<0>arguments";V:9:"HH\Vector":1:{O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"o";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:9;s:27:"<0>CodeSourceLocation<0>endLine";i:9;s:31:"<0>CodeSourceLocation<0>startColumn";i:13;s:29:"<0>CodeSourceLocation<0>endColumn";i:14;}}}s:48:"<0>CodeSimpleFunctionCallExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:9;s:27:"<0>CodeSourceLocation<0>endLine";i:9;s:31:"<0>CodeSourceLocation<0>startColumn";i:13;s:29:"<0>CodeSourceLocation<0>endColumn";i:14;}}s:32:"<0>CodeSelectClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:9;s:27:"<0>CodeSourceLocation<0>endLine";i:9;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:14;}}}s:35:"<0>CodeQueryExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:7;s:27:"<0>CodeSourceLocation<0>endLine";i:9;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:14;}}
+string(7) with \000 printed as <0>:
+closure
+string(4930) with \000 printed as <0>:
+O:19:"CodeQueryExpression":2:{s:28:"<0>CodeQueryExpression<0>clauses";V:9:"HH\Vector":3:{O:14:"CodeFromClause":3:{s:26:"<0>CodeFromClause<0>identifier";s:1:"o";s:26:"<0>CodeFromClause<0>collection";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:14:"@query_param_0";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:7;s:27:"<0>CodeSourceLocation<0>endLine";i:7;s:31:"<0>CodeSourceLocation<0>startColumn";i:17;s:29:"<0>CodeSourceLocation<0>endColumn";i:23;}}s:30:"<0>CodeFromClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:7;s:27:"<0>CodeSourceLocation<0>endLine";i:7;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:23;}}O:17:"CodeOrderbyClause":2:{s:25:"<0>CodeOrderbyClause<0>orders";V:9:"HH\Vector":2:{O:12:"CodeOrdering":3:{s:24:"<0>CodeOrdering<0>expression";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"o";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:8;s:27:"<0>CodeSourceLocation<0>endLine";i:8;s:31:"<0>CodeSourceLocation<0>startColumn";i:14;s:29:"<0>CodeSourceLocation<0>endColumn";i:15;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:8:"Customer";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:8;s:27:"<0>CodeSourceLocation<0>endLine";i:8;s:31:"<0>CodeSourceLocation<0>startColumn";i:14;s:29:"<0>CodeSourceLocation<0>endColumn";i:25;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:4:"Name";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:8;s:27:"<0>CodeSourceLocation<0>endLine";i:8;s:31:"<0>CodeSourceLocation<0>startColumn";i:14;s:29:"<0>CodeSourceLocation<0>endColumn";i:31;}}s:19:"<0>CodeOrdering<0>order";i:1;s:28:"<0>CodeOrdering<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:8;s:27:"<0>CodeSourceLocation<0>endLine";i:8;s:31:"<0>CodeSourceLocation<0>startColumn";i:14;s:29:"<0>CodeSourceLocation<0>endColumn";i:31;}}O:12:"CodeOrdering":3:{s:24:"<0>CodeOrdering<0>expression";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"o";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:8;s:27:"<0>CodeSourceLocation<0>endLine";i:8;s:31:"<0>CodeSourceLocation<0>startColumn";i:34;s:29:"<0>CodeSourceLocation<0>endColumn";i:35;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:5:"Total";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:8;s:27:"<0>CodeSourceLocation<0>endLine";i:8;s:31:"<0>CodeSourceLocation<0>startColumn";i:34;s:29:"<0>CodeSourceLocation<0>endColumn";i:42;}}s:19:"<0>CodeOrdering<0>order";i:2;s:28:"<0>CodeOrdering<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:8;s:27:"<0>CodeSourceLocation<0>endLine";i:8;s:31:"<0>CodeSourceLocation<0>startColumn";i:34;s:29:"<0>CodeSourceLocation<0>endColumn";i:52;}}}s:33:"<0>CodeOrderbyClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:8;s:27:"<0>CodeSourceLocation<0>endLine";i:8;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:52;}}O:16:"CodeSelectClause":2:{s:28:"<0>CodeSelectClause<0>expression";O:32:"CodeSimpleFunctionCallExpression":3:{s:46:"<0>CodeSimpleFunctionCallExpression<0>functionName";s:5:"tuple";s:43:"<0>CodeSimpleFunctionCallExpression<0>arguments";V:9:"HH\Vector":1:{O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"o";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:9;s:27:"<0>CodeSourceLocation<0>endLine";i:9;s:31:"<0>CodeSourceLocation<0>startColumn";i:13;s:29:"<0>CodeSourceLocation<0>endColumn";i:14;}}}s:48:"<0>CodeSimpleFunctionCallExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:9;s:27:"<0>CodeSourceLocation<0>endLine";i:9;s:31:"<0>CodeSourceLocation<0>startColumn";i:13;s:29:"<0>CodeSourceLocation<0>endColumn";i:14;}}s:32:"<0>CodeSelectClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:9;s:27:"<0>CodeSourceLocation<0>endLine";i:9;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:14;}}}s:35:"<0>CodeQueryExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:7;s:27:"<0>CodeSourceLocation<0>endLine";i:9;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:14;}}
+string(7) with \000 printed as <0>:
+closure
\ No newline at end of file
diff --git a/hphp/test/quick/phinq/select1.php.expect b/hphp/test/quick/phinq/select1.php.expect
dissimilarity index 95%
index 3a991da761d..851205b39a8 100644
--- a/hphp/test/quick/phinq/select1.php.expect
+++ b/hphp/test/quick/phinq/select1.php.expect
@@ -1,5 +1,5 @@
-string(2090) with \000 printed as <0>:
-O:19:"CodeQueryExpression":2:{s:28:"<0>CodeQueryExpression<0>clauses";O:14:"CodeFromClause":3:{s:26:"<0>CodeFromClause<0>identifier";s:1:"c";s:26:"<0>CodeFromClause<0>collection";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:14:"@query_param_0";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:10;s:27:"<0>CodeSourceLocation<0>endLine";i:10;s:31:"<0>CodeSourceLocation<0>startColumn";i:17;s:29:"<0>CodeSourceLocation<0>endColumn";i:26;}}s:30:"<0>CodeFromClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:10;s:27:"<0>CodeSourceLocation<0>endLine";i:10;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:26;}}O:16:"CodeSelectClause":2:{s:28:"<0>CodeSelectClause<0>expression";O:32:"CodeSimpleFunctionCallExpression":3:{s:46:"<0>CodeSimpleFunctionCallExpression<0>functionName";s:5:"tuple";s:43:"<0>CodeSimpleFunctionCallExpression<0>arguments";V:9:"HH\Vector":1:{O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"c";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:13;s:29:"<0>CodeSourceLocation<0>endColumn";i:14;}}}s:48:"<0>CodeSimpleFunctionCallExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:13;s:29:"<0>CodeSourceLocation<0>endColumn";i:14;}}s:32:"<0>CodeSelectClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:14;}}s:35:"<0>CodeQueryExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:10;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:14;}}
-string(7) with \000 printed as <0>:
-closure
-ok
\ No newline at end of file
+string(2110) with \000 printed as <0>:
+O:19:"CodeQueryExpression":2:{s:28:"<0>CodeQueryExpression<0>clauses";V:9:"HH\Vector":2:{O:14:"CodeFromClause":3:{s:26:"<0>CodeFromClause<0>identifier";s:1:"c";s:26:"<0>CodeFromClause<0>collection";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:14:"@query_param_0";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:10;s:27:"<0>CodeSourceLocation<0>endLine";i:10;s:31:"<0>CodeSourceLocation<0>startColumn";i:17;s:29:"<0>CodeSourceLocation<0>endColumn";i:26;}}s:30:"<0>CodeFromClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:10;s:27:"<0>CodeSourceLocation<0>endLine";i:10;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:26;}}O:16:"CodeSelectClause":2:{s:28:"<0>CodeSelectClause<0>expression";O:32:"CodeSimpleFunctionCallExpression":3:{s:46:"<0>CodeSimpleFunctionCallExpression<0>functionName";s:5:"tuple";s:43:"<0>CodeSimpleFunctionCallExpression<0>arguments";V:9:"HH\Vector":1:{O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"c";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:13;s:29:"<0>CodeSourceLocation<0>endColumn";i:14;}}}s:48:"<0>CodeSimpleFunctionCallExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:13;s:29:"<0>CodeSourceLocation<0>endColumn";i:14;}}s:32:"<0>CodeSelectClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:14;}}}s:35:"<0>CodeQueryExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:10;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:14;}}
+string(7) with \000 printed as <0>:
+closure
+ok
\ No newline at end of file
diff --git a/hphp/test/quick/phinq/select2.php.expect b/hphp/test/quick/phinq/select2.php.expect
dissimilarity index 93%
index 7ec1579050f..3c78c35e14c 100644
--- a/hphp/test/quick/phinq/select2.php.expect
+++ b/hphp/test/quick/phinq/select2.php.expect
@@ -1,4 +1,4 @@
-string(3840) with \000 printed as <0>:
-O:19:"CodeQueryExpression":2:{s:28:"<0>CodeQueryExpression<0>clauses";O:14:"CodeFromClause":3:{s:26:"<0>CodeFromClause<0>identifier";s:1:"c";s:26:"<0>CodeFromClause<0>collection";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:14:"@query_param_0";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:7;s:27:"<0>CodeSourceLocation<0>endLine";i:7;s:31:"<0>CodeSourceLocation<0>startColumn";i:17;s:29:"<0>CodeSourceLocation<0>endColumn";i:26;}}s:30:"<0>CodeFromClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:7;s:27:"<0>CodeSourceLocation<0>endLine";i:7;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:26;}}O:15:"CodeWhereClause":2:{s:26:"<0>CodeWhereClause<0>condition";O:22:"CodeBinaryOpExpression":4:{s:35:"<0>CodeBinaryOpExpression<0>expression1";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"c";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:8;s:27:"<0>CodeSourceLocation<0>endLine";i:8;s:31:"<0>CodeSourceLocation<0>startColumn";i:12;s:29:"<0>CodeSourceLocation<0>endColumn";i:13;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:4:"City";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:8;s:27:"<0>CodeSourceLocation<0>endLine";i:8;s:31:"<0>CodeSourceLocation<0>startColumn";i:12;s:29:"<0>CodeSourceLocation<0>endColumn";i:19;}}s:35:"<0>CodeBinaryOpExpression<0>expression2";O:20:"CodeScalarExpression":2:{s:27:"<0>CodeScalarExpression<0>value";s:6:"London";s:36:"<0>CodeScalarExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:8;s:27:"<0>CodeSourceLocation<0>endLine";i:8;s:31:"<0>CodeSourceLocation<0>startColumn";i:25;s:29:"<0>CodeSourceLocation<0>endColumn";i:32;}}s:33:"<0>CodeBinaryOpExpression<0>operation";i:17;s:38:"<0>CodeBinaryOpExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:8;s:27:"<0>CodeSourceLocation<0>endLine";i:8;s:31:"<0>CodeSourceLocation<0>startColumn";i:12;s:29:"<0>CodeSourceLocation<0>endColumn";i:32;}}s:31:"<0>CodeWhereClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:8;s:27:"<0>CodeSourceLocation<0>endLine";i:8;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:32;}}O:16:"CodeSelectClause":2:{s:28:"<0>CodeSelectClause<0>expression";O:32:"CodeSimpleFunctionCallExpression":3:{s:46:"<0>CodeSimpleFunctionCallExpression<0>functionName";s:5:"tuple";s:43:"<0>CodeSimpleFunctionCallExpression<0>arguments";V:9:"HH\Vector":1:{O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"c";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:9;s:27:"<0>CodeSourceLocation<0>endLine";i:9;s:31:"<0>CodeSourceLocation<0>startColumn";i:13;s:29:"<0>CodeSourceLocation<0>endColumn";i:14;}}}s:48:"<0>CodeSimpleFunctionCallExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:9;s:27:"<0>CodeSourceLocation<0>endLine";i:9;s:31:"<0>CodeSourceLocation<0>startColumn";i:13;s:29:"<0>CodeSourceLocation<0>endColumn";i:14;}}s:32:"<0>CodeSelectClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:9;s:27:"<0>CodeSourceLocation<0>endLine";i:9;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:14;}}s:35:"<0>CodeQueryExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:7;s:27:"<0>CodeSourceLocation<0>endLine";i:9;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:14;}}
-string(7) with \000 printed as <0>:
-closure
\ No newline at end of file
+string(3860) with \000 printed as <0>:
+O:19:"CodeQueryExpression":2:{s:28:"<0>CodeQueryExpression<0>clauses";V:9:"HH\Vector":3:{O:14:"CodeFromClause":3:{s:26:"<0>CodeFromClause<0>identifier";s:1:"c";s:26:"<0>CodeFromClause<0>collection";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:14:"@query_param_0";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:7;s:27:"<0>CodeSourceLocation<0>endLine";i:7;s:31:"<0>CodeSourceLocation<0>startColumn";i:17;s:29:"<0>CodeSourceLocation<0>endColumn";i:26;}}s:30:"<0>CodeFromClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:7;s:27:"<0>CodeSourceLocation<0>endLine";i:7;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:26;}}O:15:"CodeWhereClause":2:{s:26:"<0>CodeWhereClause<0>condition";O:22:"CodeBinaryOpExpression":4:{s:35:"<0>CodeBinaryOpExpression<0>expression1";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"c";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:8;s:27:"<0>CodeSourceLocation<0>endLine";i:8;s:31:"<0>CodeSourceLocation<0>startColumn";i:12;s:29:"<0>CodeSourceLocation<0>endColumn";i:13;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:4:"City";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:8;s:27:"<0>CodeSourceLocation<0>endLine";i:8;s:31:"<0>CodeSourceLocation<0>startColumn";i:12;s:29:"<0>CodeSourceLocation<0>endColumn";i:19;}}s:35:"<0>CodeBinaryOpExpression<0>expression2";O:20:"CodeScalarExpression":2:{s:27:"<0>CodeScalarExpression<0>value";s:6:"London";s:36:"<0>CodeScalarExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:8;s:27:"<0>CodeSourceLocation<0>endLine";i:8;s:31:"<0>CodeSourceLocation<0>startColumn";i:25;s:29:"<0>CodeSourceLocation<0>endColumn";i:32;}}s:33:"<0>CodeBinaryOpExpression<0>operation";i:17;s:38:"<0>CodeBinaryOpExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:8;s:27:"<0>CodeSourceLocation<0>endLine";i:8;s:31:"<0>CodeSourceLocation<0>startColumn";i:12;s:29:"<0>CodeSourceLocation<0>endColumn";i:32;}}s:31:"<0>CodeWhereClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:8;s:27:"<0>CodeSourceLocation<0>endLine";i:8;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:32;}}O:16:"CodeSelectClause":2:{s:28:"<0>CodeSelectClause<0>expression";O:32:"CodeSimpleFunctionCallExpression":3:{s:46:"<0>CodeSimpleFunctionCallExpression<0>functionName";s:5:"tuple";s:43:"<0>CodeSimpleFunctionCallExpression<0>arguments";V:9:"HH\Vector":1:{O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"c";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:9;s:27:"<0>CodeSourceLocation<0>endLine";i:9;s:31:"<0>CodeSourceLocation<0>startColumn";i:13;s:29:"<0>CodeSourceLocation<0>endColumn";i:14;}}}s:48:"<0>CodeSimpleFunctionCallExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:9;s:27:"<0>CodeSourceLocation<0>endLine";i:9;s:31:"<0>CodeSourceLocation<0>startColumn";i:13;s:29:"<0>CodeSourceLocation<0>endColumn";i:14;}}s:32:"<0>CodeSelectClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:9;s:27:"<0>CodeSourceLocation<0>endLine";i:9;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:14;}}}s:35:"<0>CodeQueryExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:7;s:27:"<0>CodeSourceLocation<0>endLine";i:9;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:14;}}
+string(7) with \000 printed as <0>:
+closure
\ No newline at end of file
diff --git a/hphp/test/quick/phinq/where1.php.expect b/hphp/test/quick/phinq/where1.php.expect
dissimilarity index 95%
index 8c6edee9388..d154e41f7da 100644
--- a/hphp/test/quick/phinq/where1.php.expect
+++ b/hphp/test/quick/phinq/where1.php.expect
@@ -1,5 +1,5 @@
-string(3862) with \000 printed as <0>:
-O:19:"CodeQueryExpression":2:{s:28:"<0>CodeQueryExpression<0>clauses";O:14:"CodeFromClause":3:{s:26:"<0>CodeFromClause<0>identifier";s:1:"c";s:26:"<0>CodeFromClause<0>collection";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:14:"@query_param_0";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:10;s:27:"<0>CodeSourceLocation<0>endLine";i:10;s:31:"<0>CodeSourceLocation<0>startColumn";i:17;s:29:"<0>CodeSourceLocation<0>endColumn";i:26;}}s:30:"<0>CodeFromClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:10;s:27:"<0>CodeSourceLocation<0>endLine";i:10;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:26;}}O:15:"CodeWhereClause":2:{s:26:"<0>CodeWhereClause<0>condition";O:22:"CodeBinaryOpExpression":4:{s:35:"<0>CodeBinaryOpExpression<0>expression1";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"c";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:12;s:29:"<0>CodeSourceLocation<0>endColumn";i:13;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:4:"City";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:12;s:29:"<0>CodeSourceLocation<0>endColumn";i:19;}}s:35:"<0>CodeBinaryOpExpression<0>expression2";O:20:"CodeScalarExpression":2:{s:27:"<0>CodeScalarExpression<0>value";s:6:"London";s:36:"<0>CodeScalarExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:25;s:29:"<0>CodeSourceLocation<0>endColumn";i:32;}}s:33:"<0>CodeBinaryOpExpression<0>operation";i:17;s:38:"<0>CodeBinaryOpExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:12;s:29:"<0>CodeSourceLocation<0>endColumn";i:32;}}s:31:"<0>CodeWhereClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:32;}}O:16:"CodeSelectClause":2:{s:28:"<0>CodeSelectClause<0>expression";O:32:"CodeSimpleFunctionCallExpression":3:{s:46:"<0>CodeSimpleFunctionCallExpression<0>functionName";s:5:"tuple";s:43:"<0>CodeSimpleFunctionCallExpression<0>arguments";V:9:"HH\Vector":1:{O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"c";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:13;s:29:"<0>CodeSourceLocation<0>endColumn";i:14;}}}s:48:"<0>CodeSimpleFunctionCallExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:13;s:29:"<0>CodeSourceLocation<0>endColumn";i:14;}}s:32:"<0>CodeSelectClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:14;}}s:35:"<0>CodeQueryExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:10;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:14;}}
-string(7) with \000 printed as <0>:
-closure
-ok
\ No newline at end of file
+string(3882) with \000 printed as <0>:
+O:19:"CodeQueryExpression":2:{s:28:"<0>CodeQueryExpression<0>clauses";V:9:"HH\Vector":3:{O:14:"CodeFromClause":3:{s:26:"<0>CodeFromClause<0>identifier";s:1:"c";s:26:"<0>CodeFromClause<0>collection";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:14:"@query_param_0";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:10;s:27:"<0>CodeSourceLocation<0>endLine";i:10;s:31:"<0>CodeSourceLocation<0>startColumn";i:17;s:29:"<0>CodeSourceLocation<0>endColumn";i:26;}}s:30:"<0>CodeFromClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:10;s:27:"<0>CodeSourceLocation<0>endLine";i:10;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:26;}}O:15:"CodeWhereClause":2:{s:26:"<0>CodeWhereClause<0>condition";O:22:"CodeBinaryOpExpression":4:{s:35:"<0>CodeBinaryOpExpression<0>expression1";O:28:"CodeObjectPropertyExpression":3:{s:36:"<0>CodeObjectPropertyExpression<0>object";O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"c";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:12;s:29:"<0>CodeSourceLocation<0>endColumn";i:13;}}s:42:"<0>CodeObjectPropertyExpression<0>propertyName";s:4:"City";s:44:"<0>CodeObjectPropertyExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:12;s:29:"<0>CodeSourceLocation<0>endColumn";i:19;}}s:35:"<0>CodeBinaryOpExpression<0>expression2";O:20:"CodeScalarExpression":2:{s:27:"<0>CodeScalarExpression<0>value";s:6:"London";s:36:"<0>CodeScalarExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:25;s:29:"<0>CodeSourceLocation<0>endColumn";i:32;}}s:33:"<0>CodeBinaryOpExpression<0>operation";i:17;s:38:"<0>CodeBinaryOpExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:12;s:29:"<0>CodeSourceLocation<0>endColumn";i:32;}}s:31:"<0>CodeWhereClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:11;s:27:"<0>CodeSourceLocation<0>endLine";i:11;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:32;}}O:16:"CodeSelectClause":2:{s:28:"<0>CodeSelectClause<0>expression";O:32:"CodeSimpleFunctionCallExpression":3:{s:46:"<0>CodeSimpleFunctionCallExpression<0>functionName";s:5:"tuple";s:43:"<0>CodeSimpleFunctionCallExpression<0>arguments";V:9:"HH\Vector":1:{O:28:"CodeSimpleVariableExpression":2:{s:42:"<0>CodeSimpleVariableExpression<0>variableName";s:1:"c";s:44:"<0>CodeSimpleVariableExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:13;s:29:"<0>CodeSourceLocation<0>endColumn";i:14;}}}s:48:"<0>CodeSimpleFunctionCallExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:13;s:29:"<0>CodeSourceLocation<0>endColumn";i:14;}}s:32:"<0>CodeSelectClause<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:12;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:14;}}}s:35:"<0>CodeQueryExpression<0>sourceLocation";O:18:"CodeSourceLocation":4:{s:29:"<0>CodeSourceLocation<0>startLine";i:10;s:27:"<0>CodeSourceLocation<0>endLine";i:12;s:31:"<0>CodeSourceLocation<0>startColumn";i:6;s:29:"<0>CodeSourceLocation<0>endColumn";i:14;}}
+string(7) with \000 printed as <0>:
+closure
+ok
\ No newline at end of file
-- 
2.11.4.GIT