mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-08-06 05:47:13 +02:00
40 lines
1.5 KiB
Diff
40 lines
1.5 KiB
Diff
Patch-Source: https://github.com/open-telemetry/opentelemetry-php-instrumentation/commit/cb03803c8a34b179b753e352a0a7879476295e9a
|
|
From cb03803c8a34b179b753e352a0a7879476295e9a Mon Sep 17 00:00:00 2001
|
|
From: Andy Postnikov <apostnikov@gmail.com>
|
|
Date: Fri, 6 Sep 2024 03:26:23 +0200
|
|
Subject: [PATCH] fix 2 tests for PHP 8.4 (#152)
|
|
|
|
- https://php.watch/rfcs/deprecate-implicitly-nullable-types
|
|
- https://github.com/php/php-src/pull/13550
|
|
---
|
|
ext/tests/post_hook_returns_cloned_modified_object.phpt | 2 +-
|
|
ext/tests/span_attribute/function_params_non_simple.phpt | 4 ++--
|
|
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/ext/tests/post_hook_returns_cloned_modified_object.phpt b/ext/tests/post_hook_returns_cloned_modified_object.phpt
|
|
index f5985af..9f20f28 100644
|
|
--- ext/tests/post_hook_returns_cloned_modified_object.phpt
|
|
+++ 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
|
|
index 1c09ce0..f637ab1 100644
|
|
--- ext/tests/span_attribute/function_params_non_simple.phpt
|
|
+++ ext/tests/span_attribute/function_params_non_simple.phpt
|
|
@@ -34,7 +34,7 @@ foo(
|
|
null,
|
|
);
|
|
?>
|
|
---EXPECT--
|
|
+--EXPECTF--
|
|
string(3) "pre"
|
|
array(4) {
|
|
["one"]=>
|