Fix tests

Author: bwoebi

tests/ext/dd_trace_span_link_with_exception.phpt

@@ -50,17 +50,18 @@ try {
 $rr->waitForFlush();
 
 $root = json_decode($rr->replayRequest()["body"], true);
-$span = $root[0][0];
+$spans = $root["chunks"][0]["spans"] ?? $root[0];
+$span = $spans[0];
 var_dump($span['meta']['error.message']);
 var_dump($span['meta']['error.type']);
 var_dump($span['meta']['error.stack']);
 var_dump($span['meta']['_dd.span_links']);
 ?>
 --EXPECTF--
 Caught exception: Oops!
-string(%d) "Uncaught Exception: Oops! in %s/dd_trace_span_link_with_exception.php:17"
+string(%d) "Uncaught Exception: Oops! in %sdd_trace_span_link_with_exception.php:17"
 string(9) "Exception"
-string(%d) "#0 %s/dd_trace_span_link_with_exception.php(12): Foo->doException()
-#1 %s/dd_trace_span_link_with_exception.php(33): Foo->bar()
+string(%d) "#0 %sdd_trace_span_link_with_exception.php(12): Foo->doException()
+#1 %sdd_trace_span_link_with_exception.php(33): Foo->bar()
 #2 {main}"
 string(33) "[{"trace_id":"42","span_id":"6"}]"

tests/ext/sandbox/install_hook/trace_closure.phpt

@@ -66,30 +66,30 @@ spans(\DDTrace\SpanData) (8) {
     result => 0
     _dd.p.tid => %s
   test\trace_closure.php:7\{closure} (trace_closure.php, 1, cli)
-    closure.declaration => %s/tests/ext/sandbox/install_hook/trace_closure.php:7
+    closure.declaration => %stests%cext%csandbox%cinstall_hook%ctrace_closure.php:7
     result => 1
     _dd.p.tid => %s
   test\foo.{closure} (trace_closure.php, 2, cli)
-    closure.declaration => %s/tests/ext/sandbox/install_hook/trace_closure.php:12
+    closure.declaration => %stests%cext%csandbox%cinstall_hook%ctrace_closure.php:12
     result => 2
     _dd.p.tid => %s
   test\bar.foo.{closure} (trace_closure.php, 3, cli)
-    closure.declaration => %s/tests/ext/sandbox/install_hook/trace_closure.php:19
+    closure.declaration => %stests%cext%csandbox%cinstall_hook%ctrace_closure.php:19
     result => 3
     _dd.p.tid => %s
   intval (trace_closure.php, 0, cli)
     result => 1
     _dd.p.tid => %s
   test\trace_closure.php:7\{closure} (trace_closure.php, 1, cli)
-    closure.declaration => %s/tests/ext/sandbox/install_hook/trace_closure.php:7
+    closure.declaration => %stests%cext%csandbox%cinstall_hook%ctrace_closure.php:7
     result => 2
     _dd.p.tid => %s
   test\foo.{closure} (trace_closure.php, 2, cli)
-    closure.declaration => %s/tests/ext/sandbox/install_hook/trace_closure.php:12
+    closure.declaration => %stests%cext%csandbox%cinstall_hook%ctrace_closure.php:12
     result => 3
     _dd.p.tid => %s
   test\bar.foo.{closure} (trace_closure.php, 3, cli)
-    closure.declaration => %s/tests/ext/sandbox/install_hook/trace_closure.php:19
+    closure.declaration => %stests%cext%csandbox%cinstall_hook%ctrace_closure.php:19
     result => 4
     _dd.p.tid => %s
 }