Merge branch '2.0.x' into 1.0.x

# Conflicts:
#	src/Bridge/ContextInjector.php
#	src/Context/Extractor/ContextExtractorInterface.php
#	src/Context/Extractor/EnvContextExtractor.php
#	src/Context/Extractor/HeaderContextExtractor.php

Author: allflame

src/Bridge/ContextInjector.php

@@ -29,6 +29,11 @@ public static function getSubscribedEvents()
         ];
     }
 
+    public function onCommand()
+    {
+        return $this->inject();
+    }
+
     public function inject()
     {
         if (null === ($context = $this->extractor->extract())) {
@@ -39,11 +44,6 @@ public function inject()
         return $this;
     }
 
-    public function onCommand()
-    {
-        return $this->inject();
-    }
-
     public function onRequest()
     {
         return $this->inject();

src/Bridge/RequestSpanListener.php

@@ -39,21 +39,6 @@ public static function getSubscribedEvents()
         ];
     }
 
-    public function getOperationName(Request $request)
-    {
-        if (null !== ($fragment = $request->attributes->get('is_fragment'))) {
-            return ($controller = $request->attributes->get('_controller', null))
-                ? sprintf('fragment.%s', $controller)
-                : 'fragment';
-        }
-
-        if (null === ($routeName = $request->attributes->get('_route', null))) {
-            return $request->getRequestUri();
-        }
-
-        return $routeName;
-    }
-
     public function onResponse(FilterResponseEvent $event)
     {
         if ($this->spans->isEmpty()) {
@@ -100,4 +85,19 @@ public function onRequest(GetResponseEvent $event)
 
         return $this;
     }
+
+    public function getOperationName(Request $request)
+    {
+        if (null !== ($fragment = $request->attributes->get('is_fragment'))) {
+            return ($controller = $request->attributes->get('_controller', null))
+                ? sprintf('fragment.%s', $controller)
+                : 'fragment';
+        }
+
+        if (null === ($routeName = $request->attributes->get('_route', null))) {
+            return $request->getRequestUri();
+        }
+
+        return $routeName;
+    }
 }