fixing implicit nullable deprecations, bump GH actions (#1340)

brettmc · web-flow · commit 1c71c0e31eaa · 2024-06-28T11:44:08.000+10:00
* implicit nullable parameters are deprecated in 8.4, so make them explicit
* update github actions versions
diff --git 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
@@ -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();

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public function fields(): array`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`/** {@inheritdoc} */`
`42`		`- public function inject(&$carrier, PropagationSetterInterface $setter = null, ContextInterface $context = null): void`
	`42`	`+ public function inject(&$carrier, ?PropagationSetterInterface $setter = null, ?ContextInterface $context = null): void`
`43`	`43`	`{`
`44`	`44`	`$setter ??= ArrayAccessGetterSetter::getInstance();`
`45`	`45`	`$context ??= Context::getCurrent();`
`@@ -59,7 +59,7 @@ public function inject(&$carrier, PropagationSetterInterface $setter = null, Con`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`/** {@inheritdoc} */`
`62`		`- public function extract($carrier, PropagationGetterInterface $getter = null, ContextInterface $context = null): ContextInterface`
	`62`	`+ public function extract($carrier, ?PropagationGetterInterface $getter = null, ?ContextInterface $context = null): ContextInterface`
`63`	`63`	`{`
`64`	`64`	`$getter ??= ArrayAccessGetterSetter::getInstance();`
`65`	`65`	`$context ??= Context::getCurrent();`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public function fields(): array`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`/** {@inheritdoc} */`
`54`		`- public function inject(&$carrier, PropagationSetterInterface $setter = null, ContextInterface $context = null): void`
	`54`	`+ public function inject(&$carrier, ?PropagationSetterInterface $setter = null, ?ContextInterface $context = null): void`
`55`	`55`	`{`
`56`	`56`	`$setter ??= ArrayAccessGetterSetter::getInstance();`
`57`	`57`	`$context ??= Context::getCurrent();`
`@@ -75,7 +75,7 @@ public function inject(&$carrier, PropagationSetterInterface $setter = null, Con`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`/** {@inheritdoc} */`
`78`		`- public function extract($carrier, PropagationGetterInterface $getter = null, ContextInterface $context = null): ContextInterface`
	`78`	`+ public function extract($carrier, ?PropagationGetterInterface $getter = null, ?ContextInterface $context = null): ContextInterface`
`79`	`79`	`{`
`80`	`80`	`$getter ??= ArrayAccessGetterSetter::getInstance();`
`81`	`81`	`$context ??= Context::getCurrent();`