Spllit ContextInjector into 2 classes

Author: allflame

src/Bridge/AppStartSpanListener.php

@@ -1,6 +1,4 @@
 <?php
-declare(strict_types=1);
-
 namespace Jaeger\Symfony\Bridge;
 
 use Jaeger\Tracer\TracerInterface;
@@ -19,7 +17,12 @@ public function __construct(TracerInterface $tracer)
         $this->tracer = $tracer;
     }
 
-    public function getStartTime(Request $request): int
+    /**
+     * @param Request $request
+     *
+     * @return int
+     */
+    public function getStartTime(Request $request)
     {
         return (int)($request->server->get('REQUEST_TIME_FLOAT', microtime(true)) * 1000000);
     }

src/Bridge/ContextInjector.php

@@ -1,6 +1,4 @@
 <?php
-declare(strict_types=1);
-
 namespace Jaeger\Symfony\Bridge;
 
 use Jaeger\Codec\CodecInterface;
@@ -34,9 +32,9 @@ public function __construct(
         InjectableInterface $injectable,
         TracerInterface $tracer,
         CodecRegistry $registry,
-        string $format,
-        string $envName,
-        string $headerName
+        $format,
+        $envName,
+        $headerName
     ) {
         $this->injectable = $injectable;
         $this->tracer = $tracer;
@@ -56,7 +54,7 @@ public static function getSubscribedEvents()
 
     public function onCommand()
     {
-        if (($data = $_ENV[$this->envName] ?? null)
+        if (($data = $_ENV[$this->envName] ?  $_ENV[$this->envName]: null)
             && $context = $this->registry[$this->format]->decode($data)) {
             $this->injectable->assign($context);
         }

src/Bridge/RequestSpanListener.php

@@ -1,6 +1,4 @@
 <?php
-declare(strict_types=1);
-
 namespace Jaeger\Symfony\Bridge;
 
 use Jaeger\Http\HttpCodeTag;

src/Bridge/TracerBridge.php

@@ -1,6 +1,4 @@
 <?php
-declare(strict_types=1);
-
 namespace Jaeger\Symfony\Bridge;
 
 use Jaeger\Tracer\FlushableInterface;
@@ -20,8 +18,8 @@ public function __construct(FlushableInterface $tracer)
     public static function getSubscribedEvents()
     {
         return [
-            ConsoleEvents::TERMINATE => [['onTerminate']],
-            KernelEvents::TERMINATE => [['onTerminate']],
+            ConsoleEvents::TERMINATE => ['onTerminate'],
+            KernelEvents::TERMINATE => ['onTerminate'],
         ];
     }