From 1c71c0e31eaaf9f1aa8c88803556a4430b897702 Mon Sep 17 00:00:00 2001
From: Brett McBride <brett.a.mcbride@gmail.com>
Date: Fri, 28 Jun 2024 11:44:08 +1000
Subject: [PATCH] fixing implicit nullable deprecations, bump GH actions
 (#1340)

* implicit nullable parameters are deprecated in 8.4, so make them explicit
* update github actions versions
---
 JaegerBaggagePropagator.php | 4 ++--
 JaegerPropagator.php        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/JaegerBaggagePropagator.php b/JaegerBaggagePropagator.php
index a7a2b6c..dd53b22 100644
--- a/JaegerBaggagePropagator.php
+++ b/JaegerBaggagePropagator.php
@@ -39,7 +39,7 @@ public function fields(): array
     }
 
     /** {@inheritdoc} */
-    public function inject(&$carrier, PropagationSetterInterface $setter = null, ContextInterface $context = null): void
+    public function inject(&$carrier, ?PropagationSetterInterface $setter = null, ?ContextInterface $context = null): void
     {
         $setter ??= ArrayAccessGetterSetter::getInstance();
         $context ??= Context::getCurrent();
@@ -59,7 +59,7 @@ public function inject(&$carrier, PropagationSetterInterface $setter = null, Con
     }
 
     /** {@inheritdoc} */
-    public function extract($carrier, PropagationGetterInterface $getter = null, ContextInterface $context = null): ContextInterface
+    public function extract($carrier, ?PropagationGetterInterface $getter = null, ?ContextInterface $context = null): ContextInterface
     {
         $getter ??= ArrayAccessGetterSetter::getInstance();
         $context ??= Context::getCurrent();
diff --git a/JaegerPropagator.php b/JaegerPropagator.php
index 3064c57..31cdcd5 100644
--- a/JaegerPropagator.php
+++ b/JaegerPropagator.php
@@ -51,7 +51,7 @@ public function fields(): array
     }
 
     /** {@inheritdoc} */
-    public function inject(&$carrier, PropagationSetterInterface $setter = null, ContextInterface $context = null): void
+    public function inject(&$carrier, ?PropagationSetterInterface $setter = null, ?ContextInterface $context = null): void
     {
         $setter ??= ArrayAccessGetterSetter::getInstance();
         $context ??= Context::getCurrent();
@@ -75,7 +75,7 @@ public function inject(&$carrier, PropagationSetterInterface $setter = null, Con
     }
 
     /** {@inheritdoc} */
-    public function extract($carrier, PropagationGetterInterface $getter = null, ContextInterface $context = null): ContextInterface
+    public function extract($carrier, ?PropagationGetterInterface $getter = null, ?ContextInterface $context = null): ContextInterface
     {
         $getter ??= ArrayAccessGetterSetter::getInstance();
         $context ??= Context::getCurrent();