@@ -19,7 +19,7 @@ discard block |
||
19 | 19 | { |
20 | 20 | public function __construct( |
21 | 21 | private readonly ?ScopeInterface $scope = new Container(), |
22 | - ) {} |
|
22 | + ){} |
|
23 | 23 | |
24 | 24 | /** |
25 | 25 | * @throws \Throwable |
@@ -27,41 +27,41 @@ discard block |
||
27 | 27 | final protected function runScope(SpanInterface $span, callable $callback): mixed |
28 | 28 | { |
29 | 29 | $container = ContainerScope::getContainer(); |
30 | - if ($container === null) { |
|
30 | + if ($container === null){ |
|
31 | 31 | return $this->scope->runScope([ |
32 | 32 | SpanInterface::class => $span, |
33 | 33 | TracerInterface::class => $this, |
34 | 34 | ], static fn(InvokerInterface $invoker): mixed => $invoker->invoke($callback)); |
35 | 35 | } |
36 | 36 | |
37 | - if ($container instanceof Container) { |
|
37 | + if ($container instanceof Container){ |
|
38 | 38 | $invoker = $container; |
39 | 39 | $binder = $container; |
40 | - } else { |
|
40 | + }else{ |
|
41 | 41 | /** @var InvokerInterface $invoker */ |
42 | 42 | $invoker = $container->get(InvokerInterface::class); |
43 | 43 | /** @var BinderInterface $binder */ |
44 | 44 | $binder = $container->get(BinderInterface::class); |
45 | 45 | } |
46 | 46 | |
47 | - try { |
|
47 | + try{ |
|
48 | 48 | $prevSpan = $container->get(SpanInterface::class); |
49 | - } catch (\Throwable) { |
|
49 | + }catch (\Throwable){ |
|
50 | 50 | $prevSpan = null; |
51 | 51 | } |
52 | 52 | |
53 | 53 | $binder->bindSingleton(SpanInterface::class, $span); |
54 | - if ($prevSpan === null) { |
|
54 | + if ($prevSpan === null){ |
|
55 | 55 | $binder->bindSingleton(TracerInterface::class, $this, true); |
56 | 56 | } |
57 | 57 | |
58 | - try { |
|
58 | + try{ |
|
59 | 59 | return $invoker->invoke($callback); |
60 | - } finally { |
|
61 | - if ($prevSpan === null) { |
|
60 | + }finally{ |
|
61 | + if ($prevSpan === null){ |
|
62 | 62 | $binder->removeBinding(SpanInterface::class); |
63 | 63 | $binder->removeBinding(TracerInterface::class); |
64 | - } else { |
|
64 | + }else{ |
|
65 | 65 | $binder->bindSingleton(SpanInterface::class, $prevSpan); |
66 | 66 | } |
67 | 67 | } |
@@ -19,7 +19,8 @@ discard block |
||
19 | 19 | { |
20 | 20 | public function __construct( |
21 | 21 | private readonly ?ScopeInterface $scope = new Container(), |
22 | - ) {} |
|
22 | + ) { |
|
23 | +} |
|
23 | 24 | |
24 | 25 | /** |
25 | 26 | * @throws \Throwable |
@@ -27,41 +28,55 @@ discard block |
||
27 | 28 | final protected function runScope(SpanInterface $span, callable $callback): mixed |
28 | 29 | { |
29 | 30 | $container = ContainerScope::getContainer(); |
30 | - if ($container === null) { |
|
31 | + if ($container === null) |
|
32 | + { |
|
31 | 33 | return $this->scope->runScope([ |
32 | 34 | SpanInterface::class => $span, |
33 | 35 | TracerInterface::class => $this, |
34 | 36 | ], static fn(InvokerInterface $invoker): mixed => $invoker->invoke($callback)); |
35 | 37 | } |
36 | 38 | |
37 | - if ($container instanceof Container) { |
|
39 | + if ($container instanceof Container) |
|
40 | + { |
|
38 | 41 | $invoker = $container; |
39 | 42 | $binder = $container; |
40 | - } else { |
|
43 | + } |
|
44 | + else |
|
45 | + { |
|
41 | 46 | /** @var InvokerInterface $invoker */ |
42 | 47 | $invoker = $container->get(InvokerInterface::class); |
43 | 48 | /** @var BinderInterface $binder */ |
44 | 49 | $binder = $container->get(BinderInterface::class); |
45 | 50 | } |
46 | 51 | |
47 | - try { |
|
52 | + try |
|
53 | + { |
|
48 | 54 | $prevSpan = $container->get(SpanInterface::class); |
49 | - } catch (\Throwable) { |
|
55 | + } |
|
56 | + catch (\Throwable) |
|
57 | + { |
|
50 | 58 | $prevSpan = null; |
51 | 59 | } |
52 | 60 | |
53 | 61 | $binder->bindSingleton(SpanInterface::class, $span); |
54 | - if ($prevSpan === null) { |
|
62 | + if ($prevSpan === null) |
|
63 | + { |
|
55 | 64 | $binder->bindSingleton(TracerInterface::class, $this, true); |
56 | 65 | } |
57 | 66 | |
58 | - try { |
|
67 | + try |
|
68 | + { |
|
59 | 69 | return $invoker->invoke($callback); |
60 | - } finally { |
|
61 | - if ($prevSpan === null) { |
|
70 | + } |
|
71 | + finally |
|
72 | + { |
|
73 | + if ($prevSpan === null) |
|
74 | + { |
|
62 | 75 | $binder->removeBinding(SpanInterface::class); |
63 | 76 | $binder->removeBinding(TracerInterface::class); |
64 | - } else { |
|
77 | + } |
|
78 | + else |
|
79 | + { |
|
65 | 80 | $binder->bindSingleton(SpanInterface::class, $prevSpan); |
66 | 81 | } |
67 | 82 | } |