Merge branch 'main' into nightly

open-telemetry · Sep 7, 2024 · 23650c6 · 23650c6
2 parents 43724db + cb03803
commit 23650c6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/ext/tests/post_hook_returns_cloned_modified_object.phpt b/ext/tests/post_hook_returns_cloned_modified_object.phpt
@@ -10,7 +10,7 @@ opentelemetry
 class Foo
 {
     public ?string $a = null;
-    public function __construct(string $a = null)
+    public function __construct(string|null $a = null)
     {
         $this->a = $a;
     }

diff --git a/ext/tests/span_attribute/function_params_non_simple.phpt b/ext/tests/span_attribute/function_params_non_simple.phpt
@@ -34,7 +34,7 @@ foo(
     null,
 );
 ?>
---EXPECT--
+--EXPECTF--
 string(3) "pre"
 array(4) {
   ["one"]=>
@@ -46,7 +46,7 @@ array(4) {
   object(stdClass)#1 (0) {
   }
   ["three"]=>
-  object(Closure)#2 (0) {
+  object(Closure)#2 (%d) {%A
   }
   ["four"]=>
   NULL