Merge pull request #1207: Apply Spiral Code Style

spiral · Jan 24, 2025 · 122a44f · 122a44f
1 parent 69f74c6
commit 122a44f
Show file tree

Hide file tree

Showing 22 changed files with 160 additions and 126 deletions.
diff --git a/composer.json b/composer.json
@@ -34,8 +34,8 @@
     ],
     "require": {
         "php": ">=8.1",
-        "spiral/boot": "^3.14.10",
-        "spiral/core": "^3.14.10"
+        "spiral/boot": "^3.15",
+        "spiral/core": "^3.15"
     },
     "require-dev": {
         "phpunit/phpunit": "^10.1",

diff --git a/src/AbstractTracer.php b/src/AbstractTracer.php
@@ -4,8 +4,9 @@
 
 namespace Spiral\Telemetry;
 
-use Spiral\Core\Attribute\Proxy;
+use Spiral\Core\BinderInterface;
 use Spiral\Core\Container;
+use Spiral\Core\ContainerScope;
 use Spiral\Core\InvokerInterface;
 use Spiral\Core\ScopeInterface;
 
@@ -17,19 +18,45 @@
 abstract class AbstractTracer implements TracerInterface
 {
     public function __construct(
-        #[Proxy] private readonly ?ScopeInterface $scope = new Container(),
-    ) {
-    }
+        private readonly ?ScopeInterface $scope = new Container(),
+    ) {}
 
     /**
      * @throws \Throwable
      */
     final protected function runScope(SpanInterface $span, callable $callback): mixed
     {
-        // TODO: Can we remove this scope?
-        return $this->scope->runScope([
-            SpanInterface::class => $span,
-            TracerInterface::class => $this,
-        ], static fn (InvokerInterface $invoker): mixed => $invoker->invoke($callback));
+        $container = ContainerScope::getContainer();
+        if ($container === null) {
+            return $this->scope->runScope([
+                SpanInterface::class => $span,
+                TracerInterface::class => $this,
+            ], static fn(InvokerInterface $invoker): mixed => $invoker->invoke($callback));
+        }
+
+        if ($container instanceof Container) {
+            $invoker = $container;
+            $binder = $container;
+        } else {
+            /** @var InvokerInterface $invoker */
+            $invoker = $container->get(InvokerInterface::class);
+            /** @var BinderInterface $binder */
+            $binder = $container->get(BinderInterface::class);
+        }
+
+        try {
+            $prevSpan = $container->get(SpanInterface::class);
+        } catch (\Throwable) {
+            $prevSpan = null;
+        }
+
+        $binder->bindSingleton(SpanInterface::class, $span);
+        try {
+            return $invoker->invoke($callback);
+        } finally {
+            $prevSpan === null
+                ? $binder->removeBinding(SpanInterface::class)
+                : $binder->bindSingleton(SpanInterface::class, $prevSpan);
+        }
     }
 }
diff --git a/src/Bootloader/TelemetryBootloader.php b/src/Bootloader/TelemetryBootloader.php
@@ -14,13 +14,11 @@
 use Spiral\Telemetry\Config\TelemetryConfig;
 use Spiral\Telemetry\ConfigTracerFactoryProvider;
 use Spiral\Telemetry\Exception\TracerException;
-use Spiral\Telemetry\LogTracer;
 use Spiral\Telemetry\LogTracerFactory;
-use Spiral\Telemetry\NullTracer;
 use Spiral\Telemetry\NullTracerFactory;
 use Spiral\Telemetry\TracerFactoryInterface;
-use Spiral\Telemetry\TracerInterface;
 use Spiral\Telemetry\TracerFactoryProviderInterface;
+use Spiral\Telemetry\TracerInterface;
 
 final class TelemetryBootloader extends Bootloader
 {
@@ -29,15 +27,13 @@ final class TelemetryBootloader extends Bootloader
         TracerFactoryProviderInterface::class => ConfigTracerFactoryProvider::class,
         ClockInterface::class => SystemClock::class,
     ];
-
     protected const BINDINGS = [
         TracerInterface::class => [self::class, 'getTracer'],
     ];
 
     public function __construct(
-        private readonly ConfiguratorInterface $config
-    ) {
-    }
+        private readonly ConfiguratorInterface $config,
+    ) {}
 
     public function init(EnvironmentInterface $env): void
     {
@@ -51,15 +47,15 @@ public function registerTracer(string $name, string|TracerFactoryInterface|Autow
     {
         $this->config->modify(
             TelemetryConfig::CONFIG,
-            new Append('drivers', $name, $driver)
+            new Append('drivers', $name, $driver),
         );
     }
 
     /**
      * @throws TracerException
      */
     public function initFactory(
-        TracerFactoryProviderInterface $tracerProvider
+        TracerFactoryProviderInterface $tracerProvider,
     ): TracerFactoryInterface {
         return $tracerProvider->getTracerFactory();
     }
@@ -68,7 +64,7 @@ public function initFactory(
      * @throws TracerException
      */
     public function getTracer(
-        TracerFactoryInterface $tracerFactory
+        TracerFactoryInterface $tracerFactory,
     ): TracerInterface {
         return $tracerFactory->make();
     }
@@ -83,7 +79,7 @@ private function initConfig(EnvironmentInterface $env): void
                     'null' => NullTracerFactory::class,
                     'log' => LogTracerFactory::class,
                 ],
-            ]
+            ],
         );
     }
 }
diff --git a/src/Config/TelemetryConfig.php b/src/Config/TelemetryConfig.php
@@ -41,7 +41,7 @@ public function getDriverConfig(string $name): string|Autowire|TracerFactoryInte
     {
         if (!isset($this->config['drivers'][$name])) {
             throw new InvalidArgumentException(
-                \sprintf('Config for telemetry driver `%s` is not defined.', $name)
+                \sprintf('Config for telemetry driver `%s` is not defined.', $name),
             );
         }
 
@@ -53,7 +53,7 @@ public function getDriverConfig(string $name): string|Autowire|TracerFactoryInte
 
         if (!\is_string($driver) && !$driver instanceof Autowire) {
             throw new InvalidArgumentException(
-                \sprintf('Trace type value for `%s` must be a string or %s', $name, Autowire::class)
+                \sprintf('Trace type value for `%s` must be a string or %s', $name, Autowire::class),
             );
         }
 

diff --git a/src/ConfigTracerFactoryProvider.php b/src/ConfigTracerFactoryProvider.php
@@ -15,9 +15,8 @@ final class ConfigTracerFactoryProvider implements TracerFactoryProviderInterfac
 
     public function __construct(
         private readonly TelemetryConfig $config,
-        private readonly FactoryInterface $factory
-    ) {
-    }
+        private readonly FactoryInterface $factory,
+    ) {}
 
     public function getTracerFactory(?string $name = null): TracerFactoryInterface
     {

diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
@@ -4,6 +4,4 @@
 
 namespace Spiral\Telemetry\Exception;
 
-class InvalidArgumentException extends TracerException
-{
-}
+class InvalidArgumentException extends TracerException {}
diff --git a/src/Exception/TracerException.php b/src/Exception/TracerException.php
@@ -4,6 +4,4 @@
 
 namespace Spiral\Telemetry\Exception;
 
-class TracerException extends \Exception
-{
-}
+class TracerException extends \Exception {}
diff --git a/src/LogTracer.php b/src/LogTracer.php
@@ -5,7 +5,6 @@
 namespace Spiral\Telemetry;
 
 use Psr\Log\LoggerInterface;
-use Ramsey\Uuid\Uuid;
 use Ramsey\Uuid\UuidFactoryInterface;
 use Spiral\Core\ScopeInterface;
 
@@ -22,7 +21,7 @@ public function __construct(
         ScopeInterface $scope,
         private readonly ClockInterface $clock,
         private readonly LoggerInterface $logger,
-        private readonly UuidFactoryInterface $uuidFactory
+        private readonly UuidFactoryInterface $uuidFactory,
     ) {
         parent::__construct($scope);
     }
@@ -33,7 +32,7 @@ public function trace(
         array $attributes = [],
         bool $scoped = false,
         ?TraceKind $traceKind = null,
-        ?int $startTime = null
+        ?int $startTime = null,
     ): mixed {
         $span = new Span($name, $attributes);
 

diff --git a/src/LogTracerFactory.php b/src/LogTracerFactory.php
@@ -6,7 +6,6 @@
 
 use Psr\Log\LoggerInterface;
 use Ramsey\Uuid\UuidFactory;
-use Spiral\Core\Attribute\Proxy;
 use Spiral\Core\ScopeInterface;
 use Spiral\Logger\LogsInterface;
 
@@ -21,10 +20,10 @@ final class LogTracerFactory implements TracerFactoryInterface
     private readonly LoggerInterface $logger;
 
     public function __construct(
-        #[Proxy] private readonly ScopeInterface $scope,
+        private readonly ScopeInterface $scope,
         private readonly ClockInterface $clock,
         LogsInterface $logs,
-        string $channel = self::LOG_CHANNEL
+        string $channel = self::LOG_CHANNEL,
     ) {
         $this->logger = $logs->getLogger($channel);
     }
@@ -35,7 +34,7 @@ public function make(array $context = []): TracerInterface
             $this->scope,
             $this->clock,
             $this->logger,
-            new UuidFactory()
+            new UuidFactory(),
         );
     }
 }
diff --git a/src/NullTracer.php b/src/NullTracer.php
@@ -17,7 +17,7 @@ public function trace(
         array $attributes = [],
         bool $scoped = false,
         ?TraceKind $traceKind = null,
-        ?int $startTime = null
+        ?int $startTime = null,
     ): mixed {
         $span = new Span($name);
         $span->setAttributes($attributes);

diff --git a/src/NullTracerFactory.php b/src/NullTracerFactory.php
@@ -4,7 +4,6 @@
 
 namespace Spiral\Telemetry;
 
-use Spiral\Core\Attribute\Proxy;
 use Spiral\Core\Container;
 use Spiral\Core\ScopeInterface;
 
@@ -15,9 +14,8 @@
 final class NullTracerFactory implements TracerFactoryInterface
 {
     public function __construct(
-        #[Proxy] private readonly ?ScopeInterface $scope = new Container(),
-    ) {
-    }
+        private readonly ?ScopeInterface $scope = new Container(),
+    ) {}
 
     public function make(array $context = []): TracerInterface
     {

diff --git a/src/Span.php b/src/Span.php
@@ -4,7 +4,6 @@
 
 namespace Spiral\Telemetry;
 
-use Ramsey\Uuid\Uuid;
 use Spiral\Telemetry\Span\Status;
 
 /**
@@ -19,9 +18,8 @@ final class Span implements SpanInterface
      */
     public function __construct(
         private string $name,
-        private array $attributes = []
-    ) {
-    }
+        private array $attributes = [],
+    ) {}
 
     public function getName(): string
     {

diff --git a/src/Span/Status.php b/src/Span/Status.php
@@ -15,7 +15,6 @@ final class Status
      */
     public function __construct(
         public readonly string|int $code,
-        public readonly ?string $description = null
-    ) {
-    }
+        public readonly ?string $description = null,
+    ) {}
 }
diff --git a/src/TracerInterface.php b/src/TracerInterface.php
@@ -42,6 +42,6 @@ public function trace(
         array $attributes = [],
         bool $scoped = false,
         ?TraceKind $traceKind = null,
-        ?int $startTime = null
+        ?int $startTime = null,
     ): mixed;
 }
diff --git a/tests/Clock/SystemClockTest.php b/tests/Clock/SystemClockTest.php
@@ -13,6 +13,6 @@ public function testNow(): void
     {
         $clock = new SystemClock();
 
-        $this->assertIsInt($clock->now());
+        self::assertIsInt($clock->now());
     }
 }
diff --git a/tests/Config/TelemetryConfigTest.php b/tests/Config/TelemetryConfigTest.php
@@ -16,33 +16,33 @@ public function testGetsDefaultDriver(): void
     {
         $config = new TelemetryConfig(['default' => 'foo']);
 
-        $this->assertSame('foo', $config->getDefaultDriver());
+        self::assertSame('foo', $config->getDefaultDriver());
     }
 
     public function testGetsDriverConfigAsString(): void
     {
         $config = new TelemetryConfig(['drivers' => [
-            'foo' => 'bar'
+            'foo' => 'bar',
         ]]);
 
-        $this->assertSame('bar', $config->getDriverConfig('foo'));
+        self::assertSame('bar', $config->getDriverConfig('foo'));
     }
 
     public function testGetsDriverConfigAsAutowire(): void
     {
         $config = new TelemetryConfig(['drivers' => [
-            'foo' => $driver = new Autowire('bar')
+            'foo' => $driver = new Autowire('bar'),
         ]]);
 
-        $this->assertSame($driver, $config->getDriverConfig('foo'));
+        self::assertSame($driver, $config->getDriverConfig('foo'));
     }
 
     public function testGetsDriverConfigAsObject(): void
     {
         $config = new TelemetryConfig(['drivers' => [
-            'foo' => $driver = m::mock(TracerFactoryInterface::class)
+            'foo' => $driver = m::mock(TracerFactoryInterface::class),
         ]]);
 
-        $this->assertSame($driver, $config->getDriverConfig('foo'));
+        self::assertSame($driver, $config->getDriverConfig('foo'));
     }
 }