Rename context scopes

spiral · Aug 30, 2024 · cc7441f · cc7441f
1 parent d1cb4ee
commit cc7441f
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 11 deletions.
diff --git a/src/Centrifugo/Server.php b/src/Centrifugo/Server.php
@@ -53,7 +53,7 @@ public function serve(CentrifugoWorkerInterface $worker): void
                 $services = $this->services;
 
                 $scope->runScope(
-                    new Scope('centrifugo.request', [RequestInterface::class => $request]),
+                    new Scope('centrifugo-request', [RequestInterface::class => $request]),
                     static fn(): mixed => $pipeline->handle(
                         new CallContext(
                             /** @see ServiceInterface::handle() */

diff --git a/src/GRPC/Interceptor/Invoker.php b/src/GRPC/Interceptor/Invoker.php
@@ -37,7 +37,7 @@ public function invoke(ServiceInterface $service, Method $method, ContextInterfa
 
         /** @psalm-suppress InvalidArgument */
         return $this->scope->runScope(
-            new Scope('grpc.request', [UnaryCallInterface::class => new UnaryCall($ctx, $method, $message)]),
+            new Scope('grpc-request', [UnaryCallInterface::class => new UnaryCall($ctx, $method, $message)]),
             static fn(): string => self::resultToString($handler->handle(
                 new CallContext(Target::fromPair($service, $method->name), [
                     $ctx,

diff --git a/src/Queue/Dispatcher.php b/src/Queue/Dispatcher.php
@@ -62,7 +62,7 @@ public function serve(): void
             try {
                 /** @psalm-suppress InvalidArgument */
                 $this->scope->runScope(
-                    new Scope('queue.task', [TaskInterface::class => new Task(
+                    new Scope('queue-task', [TaskInterface::class => new Task(
                         id: $task->getId(),
                         queue: $task->getQueue(),
                         name: $task->getName(),

diff --git a/src/Tcp/Server.php b/src/Tcp/Server.php
@@ -67,7 +67,7 @@ public function serve(WorkerInterface $worker = null): void
                  * @var ResponseInterface $response
                  */
                 $response = $scope->runScope(
-                    new Scope('tcp.request', [RequestInterface::class => $request]),
+                    new Scope('tcp-request', [RequestInterface::class => $request]),
                     static fn (): mixed => $pipeline->handle(new CallContext(
                         /** @see \Spiral\RoadRunnerBridge\Tcp\Service\ServiceInterface::handle() */
                         Target::fromPair($services->getService($server), 'handle'),

diff --git a/tests/app/Centrifugo/ScopedTestService.php b/tests/app/Centrifugo/ScopedTestService.php
@@ -10,7 +10,7 @@
 use Spiral\Core\Internal\Introspector;
 use Spiral\RoadRunnerBridge\Centrifugo\ServiceInterface;
 
-#[Scope('centrifugo.request')]
+#[Scope('centrifugo-request')]
 final class ScopedTestService implements ServiceInterface
 {
     public static array $scopes = [];

diff --git a/tests/app/Tcp/ScopedTestService.php b/tests/app/Tcp/ScopedTestService.php
@@ -12,7 +12,7 @@
 use Spiral\RoadRunnerBridge\Tcp\Response\ResponseInterface;
 use Spiral\RoadRunnerBridge\Tcp\Service\ServiceInterface;
 
-#[Scope('tcp.request')]
+#[Scope('tcp-request')]
 final class ScopedTestService implements ServiceInterface
 {
     public static array $scopes = [];

diff --git a/tests/src/Centrifugo/DispatcherTest.php b/tests/src/Centrifugo/DispatcherTest.php
@@ -113,7 +113,7 @@ public function testCentrifugoScope(): void
 
         $worker = $this->mockContainer(CentrifugoWorker::class, CentrifugoWorkerInterface::class);
         $this->getContainer()
-            ->getBinder('centrifugo.request')
+            ->getBinder('centrifugo-request')
             ->bindSingleton(ScopedTestService::class, ScopedTestService::class);
 
         $request = new Publish($this->createMock(WorkerInterface::class), '', '', '', '', '', '', [], [], []);
@@ -130,6 +130,6 @@ public function testCentrifugoScope(): void
 
         $this->getApp()->serve();
 
-        $this->assertEquals(['centrifugo.request', 'centrifugo', 'root'], ScopedTestService::$scopes);
+        $this->assertEquals(['centrifugo-request', 'centrifugo', 'root'], ScopedTestService::$scopes);
     }
 }
diff --git a/tests/src/Queue/DispatcherTest.php b/tests/src/Queue/DispatcherTest.php
@@ -128,7 +128,7 @@ public function testQueueScopes(): void
 
         $this->getApp()->serve();
 
-        $this->assertEquals(['queue.task', 'queue', 'root'], ScopedJob::$scopes);
+        $this->assertEquals(['queue-task', 'queue', 'root'], ScopedJob::$scopes);
         $this->assertEquals(new Task(
             id: 'foo-id',
             queue: 'default',

diff --git a/tests/src/Tcp/DispatcherTest.php b/tests/src/Tcp/DispatcherTest.php
@@ -148,7 +148,7 @@ public function testTcpScope(): void
 
         $worker = $this->mockContainer(WorkerInterface::class);
         $this->getContainer()
-            ->getBinder('tcp.request')
+            ->getBinder('tcp-request')
             ->bindSingleton(ScopedTestService::class, ScopedTestService::class);
 
         $this->getContainer()->bind(RoadRunnerMode::class, RoadRunnerMode::Tcp);
@@ -178,6 +178,6 @@ public function testTcpScope(): void
 
         $this->getApp()->serve();
 
-        $this->assertEquals(['tcp.request', 'tcp', 'root'], ScopedTestService::$scopes);
+        $this->assertEquals(['tcp-request', 'tcp', 'root'], ScopedTestService::$scopes);
     }
 }