Merge branch '2.0.x' into 1.0.x

allflame · allflame · commit e9f38f0f4b73 · 2017-12-20T11:32:53.000+02:00
diff --git a/src/Bridge/ContextInjector.php b/src/Bridge/ContextInjector.php
@@ -47,8 +47,8 @@ public function __construct(
     public static function getSubscribedEvents()
     {
         return [
-            ConsoleEvents::COMMAND => ['onCommand'],
-            KernelEvents::REQUEST => ['onRequest'],
+            ConsoleEvents::COMMAND => ['onCommand', 1000],
+            KernelEvents::REQUEST => ['onRequest', 1000],
         ];
     }
 
diff --git a/src/Bridge/RequestSpanListener.php b/src/Bridge/RequestSpanListener.php
@@ -30,8 +30,8 @@ public function __construct(\SplStack $stack, TracerInterface $tracer)
     public static function getSubscribedEvents()
     {
         return [
-            KernelEvents::REQUEST => ['onRequest', 1],
-            KernelEvents::RESPONSE => ['onResponse', 1],
+            KernelEvents::REQUEST => ['onRequest', -1],
+            KernelEvents::RESPONSE => ['onResponse', -1],
         ];
     }
 

Original file line number	Diff line number	Diff line change
`@@ -47,8 +47,8 @@ public function __construct(`
`47`	`47`	`public static function getSubscribedEvents()`
`48`	`48`	`{`
`49`	`49`	`return [`
`50`		`- ConsoleEvents::COMMAND => ['onCommand'],`
`51`		`- KernelEvents::REQUEST => ['onRequest'],`
	`50`	`+ ConsoleEvents::COMMAND => ['onCommand', 1000],`
	`51`	`+ KernelEvents::REQUEST => ['onRequest', 1000],`
`52`	`52`	`];`
`53`	`53`	`}`
`54`	`54`
Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,8 @@ public function __construct(\SplStack $stack, TracerInterface $tracer)`
`30`	`30`	`public static function getSubscribedEvents()`
`31`	`31`	`{`
`32`	`32`	`return [`
`33`		`- KernelEvents::REQUEST => ['onRequest', 1],`
`34`		`- KernelEvents::RESPONSE => ['onResponse', 1],`
	`33`	`+ KernelEvents::REQUEST => ['onRequest', -1],`
	`34`	`+ KernelEvents::RESPONSE => ['onResponse', -1],`
`35`	`35`	`];`
`36`	`36`	`}`
`37`	`37`