Merge pull request #15 from spiral/feature/rr-mode-enum

Adds RoadRunnerMode enum
spiral · Jun 28, 2022 · 7191894 · 7191894
2 parents b8705b7 + 1eb90a8
commit 7191894
Show file tree

Hide file tree

Showing 11 changed files with 100 additions and 113 deletions.
diff --git a/src/GRPC/Dispatcher.php b/src/GRPC/Dispatcher.php
@@ -7,24 +7,23 @@
 use Psr\Container\ContainerInterface;
 use Spiral\Boot\DispatcherInterface;
 use Spiral\Boot\FinalizerInterface;
-use Spiral\RoadRunner\Environment\Mode;
-use Spiral\RoadRunner\EnvironmentInterface;
 use Spiral\RoadRunner\GRPC\Server;
 use Spiral\RoadRunner\WorkerInterface;
 use Spiral\Exceptions\ExceptionReporterInterface;
+use Spiral\RoadRunnerBridge\RoadRunnerMode;
 
 final class Dispatcher implements DispatcherInterface
 {
     public function __construct(
-        private readonly EnvironmentInterface $env,
         private readonly ContainerInterface $container,
-        private readonly FinalizerInterface $finalizer
+        private readonly FinalizerInterface $finalizer,
+        private readonly RoadRunnerMode $mode
     ) {
     }
 
     public function canServe(): bool
     {
-        return \PHP_SAPI === 'cli' && $this->env->getMode() === Mode::MODE_GRPC;
+        return \PHP_SAPI === 'cli' && $this->mode === RoadRunnerMode::Grpc;
     }
 
     public function serve(): void

diff --git a/src/Http/Dispatcher.php b/src/Http/Dispatcher.php
@@ -12,23 +12,22 @@
 use Spiral\Exceptions\ExceptionHandlerInterface;
 use Spiral\Exceptions\Verbosity;
 use Spiral\Http\Http;
-use Spiral\RoadRunner\Environment\Mode;
-use Spiral\RoadRunner\EnvironmentInterface;
 use Spiral\RoadRunner\Http\PSR7WorkerInterface;
+use Spiral\RoadRunnerBridge\RoadRunnerMode;
 
 final class Dispatcher implements DispatcherInterface
 {
     public function __construct(
-        private readonly EnvironmentInterface $env,
         private readonly ContainerInterface $container,
         private readonly ErrorHandlerInterface $errorHandler,
-        private readonly FinalizerInterface $finalizer
+        private readonly FinalizerInterface $finalizer,
+        private readonly RoadRunnerMode $mode
     ) {
     }
 
     public function canServe(): bool
     {
-        return \PHP_SAPI === 'cli' && $this->env->getMode() === Mode::MODE_HTTP;
+        return \PHP_SAPI === 'cli' && $this->mode === RoadRunnerMode::Http;
     }
 
     public function serve(): void

diff --git a/src/Queue/Dispatcher.php b/src/Queue/Dispatcher.php
@@ -9,25 +9,24 @@
 use Spiral\Boot\DispatcherInterface;
 use Spiral\Boot\FinalizerInterface;
 use Spiral\Queue\HandlerRegistryInterface;
-use Spiral\RoadRunner\Environment\Mode;
-use Spiral\RoadRunner\EnvironmentInterface;
 use Spiral\RoadRunner\Jobs\ConsumerInterface;
 use Spiral\RoadRunner\Jobs\Exception\JobsException;
 use Spiral\RoadRunner\Jobs\Task\ReceivedTaskInterface;
 use Spiral\Queue\Failed\FailedJobHandlerInterface;
+use Spiral\RoadRunnerBridge\RoadRunnerMode;
 
 final class Dispatcher implements DispatcherInterface
 {
     public function __construct(
         private readonly ContainerInterface $container,
         private readonly FinalizerInterface $finalizer,
-        private readonly EnvironmentInterface $env
+        private readonly RoadRunnerMode $mode
     ) {
     }
 
     public function canServe(): bool
     {
-        return \PHP_SAPI === 'cli' && $this->env->getMode() === Mode::MODE_JOBS;
+        return \PHP_SAPI === 'cli' && $this->mode === RoadRunnerMode::Jobs;
     }
 
     /**

diff --git a/src/RoadRunnerMode.php b/src/RoadRunnerMode.php
@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Spiral\RoadRunnerBridge;
+
+use Spiral\Boot\Injector\InjectableEnumInterface;
+use Spiral\Boot\Injector\ProvideFrom;
+use Spiral\RoadRunner\EnvironmentInterface;
+
+#[ProvideFrom(method: 'detect')]
+enum RoadRunnerMode: string implements InjectableEnumInterface
+{
+    case Unknown = 'unknown';
+    case Http = 'http';
+    case Temporal = 'temporal';
+    case Jobs = 'jobs';
+    case Grpc = 'grpc';
+    case Tcp = 'tcp';
+
+    public static function detect(EnvironmentInterface $environment): self
+    {
+        $value = $environment->getMode();
+
+        return self::tryFrom($value) ?? self::Unknown;
+    }
+}
diff --git a/src/Tcp/Dispatcher.php b/src/Tcp/Dispatcher.php
@@ -8,22 +8,21 @@
 use Spiral\Boot\DispatcherInterface;
 use Spiral\Boot\FinalizerInterface;
 use Spiral\Exceptions\ExceptionReporterInterface;
-use Spiral\RoadRunner\Environment\Mode;
-use Spiral\RoadRunner\EnvironmentInterface;
 use Spiral\RoadRunner\WorkerInterface;
+use Spiral\RoadRunnerBridge\RoadRunnerMode;
 
 final class Dispatcher implements DispatcherInterface
 {
     public function __construct(
-        private readonly EnvironmentInterface $env,
         private readonly ContainerInterface $container,
-        private readonly FinalizerInterface $finalizer
+        private readonly FinalizerInterface $finalizer,
+        private readonly RoadRunnerMode $mode
     ) {
     }
 
     public function canServe(): bool
     {
-        return \PHP_SAPI === 'cli' && $this->env->getMode() === Mode::MODE_TCP;
+        return \PHP_SAPI === 'cli' && $this->mode === RoadRunnerMode::Tcp;
     }
 
     public function serve(): void

diff --git a/tests/src/GRPC/DispatcherTest.php b/tests/src/GRPC/DispatcherTest.php
@@ -6,12 +6,11 @@
 
 use Spiral\App\GRPC\EchoService\Message;
 use Spiral\Boot\FinalizerInterface;
-use Spiral\RoadRunner\Environment;
-use Spiral\RoadRunner\EnvironmentInterface;
 use Spiral\RoadRunner\Payload;
 use Spiral\RoadRunner\Worker;
 use Spiral\RoadRunner\WorkerInterface;
 use Spiral\RoadRunnerBridge\GRPC\Dispatcher;
+use Spiral\RoadRunnerBridge\RoadRunnerMode;
 use Spiral\Tests\ConsoleTestCase;
 
 final class DispatcherTest extends ConsoleTestCase
@@ -29,24 +28,14 @@ public function testCanServeShouldReturnFalseWithWrongEnvironment(): void
 
     public function testCanServe(): void
     {
-        $this->getContainer()->bind(EnvironmentInterface::class, function () {
-            return new Environment([
-                'RR_MODE' => 'grpc',
-            ]);
-        });
-
+        $this->getContainer()->bind(RoadRunnerMode::class, RoadRunnerMode::Grpc);
         $this->assertDispatcherCanBeServed(Dispatcher::class);
     }
 
     public function testServe()
     {
         $worker = $this->mockContainer(WorkerInterface::class, Worker::class);
-
-        $this->getContainer()->bind(EnvironmentInterface::class, function () {
-            return new Environment([
-                'RR_MODE' => 'grpc',
-            ]);
-        });
+        $this->getContainer()->bind(RoadRunnerMode::class, RoadRunnerMode::Grpc);
 
         $finalizer = $this->mockContainer(FinalizerInterface::class);
         $finalizer->shouldReceive('finalize')->once()->with(false);

diff --git a/tests/src/Http/DispatcherTest.php b/tests/src/Http/DispatcherTest.php
@@ -12,11 +12,10 @@
 use Psr\Http\Server\RequestHandlerInterface;
 use Spiral\Boot\FinalizerInterface;
 use Spiral\Http\Http;
-use Spiral\RoadRunner\Environment;
-use Spiral\RoadRunner\EnvironmentInterface;
 use Spiral\RoadRunner\Http\PSR7WorkerInterface;
 use Spiral\RoadRunnerBridge\Http\Dispatcher;
 use Spiral\RoadRunnerBridge\Http\ErrorHandlerInterface;
+use Spiral\RoadRunnerBridge\RoadRunnerMode;
 use Spiral\Tests\TestCase;
 
 final class DispatcherTest extends TestCase
@@ -28,22 +27,14 @@ public function testCanServeShouldReturnFalseWithWrongEnvironment(): void
 
     public function testCanServe(): void
     {
-        $this->getContainer()->bind(EnvironmentInterface::class, function () {
-            return new Environment([
-                'RR_MODE' => 'http',
-            ]);
-        });
+        $this->getContainer()->bind(RoadRunnerMode::class, RoadRunnerMode::Http);
 
         $this->assertDispatcherCanBeServed(Dispatcher::class);
     }
 
     public function testServe(): void
     {
-        $this->getContainer()->bind(EnvironmentInterface::class, function () {
-            return new Environment([
-                'RR_MODE' => 'http',
-            ]);
-        });
+        $this->getContainer()->bind(RoadRunnerMode::class, RoadRunnerMode::Http);
 
         $finalizer = $this->mockContainer(FinalizerInterface::class);
         $finalizer->shouldReceive('finalize')->once()->with(false);
@@ -68,11 +59,7 @@ public function testServe(): void
 
     public function testServeWithError(): void
     {
-        $this->getContainer()->bind(EnvironmentInterface::class, function () {
-            return new Environment([
-                'RR_MODE' => 'http',
-            ]);
-        });
+        $this->getContainer()->bind(RoadRunnerMode::class, RoadRunnerMode::Http);
 
         $finalizer = $this->mockContainer(FinalizerInterface::class);
         $finalizer->shouldReceive('finalize')->once()->with(false);

diff --git a/tests/src/Queue/DispatcherTest.php b/tests/src/Queue/DispatcherTest.php
@@ -9,11 +9,10 @@
 use Spiral\Queue\Failed\FailedJobHandlerInterface;
 use Spiral\Queue\HandlerInterface;
 use Spiral\Queue\HandlerRegistryInterface;
-use Spiral\RoadRunner\Environment;
-use Spiral\RoadRunner\EnvironmentInterface;
 use Spiral\RoadRunner\Jobs\ConsumerInterface;
 use Spiral\RoadRunner\Jobs\Task\ReceivedTaskInterface;
 use Spiral\RoadRunnerBridge\Queue\Dispatcher;
+use Spiral\RoadRunnerBridge\RoadRunnerMode;
 use Spiral\Tests\TestCase;
 
 final class DispatcherTest extends TestCase
@@ -25,22 +24,13 @@ public function testCanServeShouldReturnFalseWithWrongEnvironment(): void
 
     public function testCanServe(): void
     {
-        $this->getContainer()->bind(EnvironmentInterface::class, function () {
-            return new Environment([
-                'RR_MODE' => 'jobs',
-            ]);
-        });
-
+        $this->getContainer()->bind(RoadRunnerMode::class, RoadRunnerMode::Jobs);
         $this->assertDispatcherCanBeServed(Dispatcher::class);
     }
 
     public function testServeReceivedTask(): void
     {
-        $this->getContainer()->bind(EnvironmentInterface::class, function () {
-            return new Environment([
-                'RR_MODE' => 'jobs',
-            ]);
-        });
+        $this->getContainer()->bind(RoadRunnerMode::class, RoadRunnerMode::Jobs);
 
         $finalizer = $this->mockContainer(FinalizerInterface::class);
         $finalizer->shouldReceive('finalize')->once()->with(false);
@@ -66,11 +56,7 @@ public function testServeReceivedTask(): void
 
     public function testServeReceivedTaskWithThrownException(): void
     {
-        $this->getContainer()->bind(EnvironmentInterface::class, function () {
-            return new Environment([
-                'RR_MODE' => 'jobs',
-            ]);
-        });
+        $this->getContainer()->bind(RoadRunnerMode::class, RoadRunnerMode::Jobs);
 
         $e = new \Exception('Something went wrong');
 

diff --git a/tests/src/Queue/QueueTest.php b/tests/src/Queue/QueueTest.php
@@ -6,7 +6,6 @@
 
 use Mockery as m;
 use Spiral\Core\Container;
-use Spiral\Queue\Job\CallableJob;
 use Spiral\Queue\Job\ObjectJob;
 use Spiral\Queue\Options;
 use Spiral\RoadRunner\Jobs\Queue\CreateInfoInterface;
@@ -112,26 +111,4 @@ public function testPushObject()
 
         $this->assertSame('task-id', $this->queue->pushObject($object));
     }
-
-    public function testPushCallable()
-    {
-        $this->registry->shouldReceive('getPipeline')
-            ->once()
-            ->with('default')
-            ->andReturn($queue = m::mock(QueueInterface::class));
-
-        $callback = function () {
-            return 'bar';
-        };
-
-        $preparedTask = m::mock(PreparedTaskInterface::class);
-        $queuedTask = m::mock(QueuedTaskInterface::class);
-        $queue->shouldReceive('create')->once()
-            ->withSomeOfArgs(CallableJob::class, ['callback' => $callback])
-            ->andReturn($preparedTask);
-        $queue->shouldReceive('dispatch')->once()->with($preparedTask)->andReturn($queuedTask);
-        $queuedTask->shouldReceive('getId')->once()->andReturn('task-id');
-
-        $this->assertSame('task-id', $this->queue->pushCallable($callback));
-    }
 }
diff --git a/tests/src/RoadRunnerModeTest.php b/tests/src/RoadRunnerModeTest.php
@@ -0,0 +1,42 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Spiral\Tests;
+
+use Spiral\RoadRunner\Environment;
+use Spiral\RoadRunner\EnvironmentInterface;
+use Spiral\RoadRunnerBridge\RoadRunnerMode;
+
+final class RoadRunnerModeTest extends TestCase
+{
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->getContainer()->removeBinding(RoadRunnerMode::class);
+    }
+
+    /**
+     * @dataProvider roadRunnerModes
+     */
+    public function testDetectMode(string $mode, RoadRunnerMode $expected): void
+    {
+        $this->getContainer()->bind(EnvironmentInterface::class, static fn () => new Environment([
+            'RR_MODE' => $mode,
+        ]));
+
+        $this->assertSame($expected, $this->getContainer()->get(RoadRunnerMode::class));
+    }
+
+    public function roadRunnerModes()
+    {
+        return [
+            'http' => ['http', RoadRunnerMode::Http],
+            'tcp' => ['tcp', RoadRunnerMode::Tcp],
+            'grpc' => ['grpc', RoadRunnerMode::Grpc],
+            'temporal' => ['temporal', RoadRunnerMode::Temporal],
+            'jobs' => ['jobs', RoadRunnerMode::Jobs],
+            'test' => ['test', RoadRunnerMode::Unknown],
+        ];
+    }
+}