fix dumpsymbolinfo tests

Summary: broke on trunk because of interference of 2 diffs landing at about the same time: D14457324 and another one printing full type of functions (which?) Reviewed By: Wilfred, manzyuk Differential Revision: D14561631 fbshipit-source-id: 13b95bff9ffa41d6b1dca8b505b49685a3f35f33
facebook · Mar 21, 2019 · dd424d0 · dd424d0
1 parent 215edd2
commit dd424d0
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 15 deletions.
diff --git a/hphp/hack/test/dumpsymbolinfo/async_lambda.php.exp b/hphp/hack/test/dumpsymbolinfo/async_lambda.php.exp
@@ -36,12 +36,12 @@
     },
     {
       "pos":{"filename":"async_lambda.php","line":9,"char_start":3,"char_end":5},
-      "type":"[fun]",
+      "type":"(function(nothing $x): Awaitable<void>)",
       "ident":0
     },
     {
       "pos":{"filename":"async_lambda.php","line":9,"char_start":15,"char_end":16},
-      "type":"_",
+      "type":"nothing",
       "ident":-187650736
     },
     {
@@ -51,7 +51,7 @@
     },
     {
       "pos":{"filename":"async_lambda.php","line":10,"char_start":28,"char_end":29},
-      "type":"_",
+      "type":"nothing",
       "ident":-187650736
     }
   ]

diff --git a/hphp/hack/test/dumpsymbolinfo/lambda_argument.php.exp b/hphp/hack/test/dumpsymbolinfo/lambda_argument.php.exp
@@ -20,37 +20,37 @@
     },
     {
       "pos":{"filename":"lambda_argument.php","line":8,"char_start":3,"char_end":4},
-      "type":"[fun]",
+      "type":"(function(vec<int> $nums): void)",
       "ident":0
     },
     {
       "pos":{"filename":"lambda_argument.php","line":8,"char_start":8,"char_end":12},
-      "type":"HackSuggest<vec<int>>",
+      "type":"vec<int>",
       "ident":-602022284
     },
     {
       "pos":{"filename":"lambda_argument.php","line":9,"char_start":5,"char_end":6},
-      "type":"vec<nothing>",
+      "type":"vec<int>",
       "ident":0
     },
     {
       "pos":{"filename":"lambda_argument.php","line":9,"char_start":14,"char_end":18},
-      "type":"_",
+      "type":"vec<int>",
       "ident":-602022284
     },
     {
       "pos":{"filename":"lambda_argument.php","line":9,"char_start":21,"char_end":22},
-      "type":"nothing",
+      "type":"int",
       "ident":-336303992
     },
     {
       "pos":{"filename":"lambda_argument.php","line":9,"char_start":28,"char_end":29},
-      "type":"nothing",
+      "type":"int",
       "ident":-336303992
     },
     {
       "pos":{"filename":"lambda_argument.php","line":11,"char_start":3,"char_end":4},
-      "type":"[fun]",
+      "type":"(function(vec<int> $nums): void)",
       "ident":0
     }
   ]

diff --git a/hphp/hack/test/dumpsymbolinfo/lambda_argument_reused.php.exp b/hphp/hack/test/dumpsymbolinfo/lambda_argument_reused.php.exp
@@ -1,5 +1,27 @@
 {
   "function_calls":[
+    {
+      "name":"C::foo",
+      "type":"Method",
+      "pos":{
+        "filename":"lambda_argument_reused.php",
+        "line":13,
+        "char_start":14,
+        "char_end":16
+      },
+      "caller":"test"
+    },
+    {
+      "name":"D::foo",
+      "type":"Method",
+      "pos":{
+        "filename":"lambda_argument_reused.php",
+        "line":13,
+        "char_start":14,
+        "char_end":16
+      },
+      "caller":"test"
+    },
     {
       "name":"C::__construct",
       "type":"Constructor",
@@ -26,12 +48,12 @@
   "symbol_types":[
     {
       "pos":{"filename":"lambda_argument_reused.php","line":12,"char_start":3,"char_end":4},
-      "type":"[fun]",
+      "type":"(function({suggest:(C | D)} $x): _)",
       "ident":0
     },
     {
       "pos":{"filename":"lambda_argument_reused.php","line":12,"char_start":8,"char_end":9},
-      "type":"_",
+      "type":"{suggest:(C | D)}",
       "ident":-187650736
     },
     {
@@ -46,7 +68,7 @@
         "char_start":10,
         "char_end":11
       },
-      "type":"_",
+      "type":"{suggest:(C | D)}",
       "ident":-187650736
     },
     {
@@ -61,12 +83,12 @@
     },
     {
       "pos":{"filename":"lambda_argument_reused.php","line":16,"char_start":3,"char_end":4},
-      "type":"[fun]",
+      "type":"(function({suggest:(C | D)} $x): _)",
       "ident":0
     },
     {
       "pos":{"filename":"lambda_argument_reused.php","line":17,"char_start":3,"char_end":4},
-      "type":"[fun]",
+      "type":"(function({suggest:(C | D)} $x): _)",
       "ident":0
     }
   ]