From f972155525a7f5c0734a1016bbe7d890dcda96bd Mon Sep 17 00:00:00 2001 From: Sergei Predvoditelev Date: Sun, 7 Jun 2026 16:17:52 +0300 Subject: [PATCH] Remove `FakeAdapter` --- stubs/InMemoryAdapter.php | 9 ++++ tests/App/FakeAdapter.php | 48 ------------------- .../Consume/MiddlewareDispatcherTest.php | 4 +- .../Consume/MiddlewareFactoryTest.php | 4 +- .../MiddlewareDispatcherTest.php | 4 +- .../FailureHandling/MiddlewareFactoryTest.php | 4 +- .../Push/AdapterPushHandlerTest.php | 9 ++-- .../Push/MiddlewareDispatcherTest.php | 4 +- .../Middleware/Push/MiddlewareFactoryTest.php | 4 +- tests/Unit/QueueTest.php | 5 +- 10 files changed, 27 insertions(+), 68 deletions(-) delete mode 100644 tests/App/FakeAdapter.php diff --git a/stubs/InMemoryAdapter.php b/stubs/InMemoryAdapter.php index 917fa14b..5a0ad198 100644 --- a/stubs/InMemoryAdapter.php +++ b/stubs/InMemoryAdapter.php @@ -29,6 +29,15 @@ final class InMemoryAdapter implements AdapterInterface private array $messages = []; private int $current = 0; + /** + * @return MessageInterface[] + * @psalm-return list + */ + public function getMessagesList(): array + { + return array_values($this->messages); + } + public function push(MessageInterface $message): MessageInterface { $id = count($this->messages) + $this->current; diff --git a/tests/App/FakeAdapter.php b/tests/App/FakeAdapter.php deleted file mode 100644 index 683cd47d..00000000 --- a/tests/App/FakeAdapter.php +++ /dev/null @@ -1,48 +0,0 @@ -pushMessages[] = $message; - - return $message; - } - - public function runExisting(callable $handlerCallback): void - { - throw new Exception('`runExisting()` method is not implemented yet.'); - } - - public function status(string|int $id): MessageStatus - { - throw new Exception('`status()` method is not implemented yet.'); - } - - public function subscribe(callable $handlerCallback): void - { - throw new Exception('`subscribe()` method is not implemented yet.'); - } - - public function withChannel(string|BackedEnum $channel): self - { - $new = clone $this; - $new->channel = StringNormalizer::normalize($channel); - - return $new; - } -} diff --git a/tests/Unit/Middleware/Consume/MiddlewareDispatcherTest.php b/tests/Unit/Middleware/Consume/MiddlewareDispatcherTest.php index e0c817d4..039d4c55 100644 --- a/tests/Unit/Middleware/Consume/MiddlewareDispatcherTest.php +++ b/tests/Unit/Middleware/Consume/MiddlewareDispatcherTest.php @@ -16,7 +16,7 @@ use Yiisoft\Queue\Middleware\Consume\ConsumeHandlerInterface; use Yiisoft\Queue\Middleware\Consume\ConsumeMiddlewareFactory; use Yiisoft\Queue\QueueInterface; -use Yiisoft\Queue\Tests\App\FakeAdapter; +use Yiisoft\Queue\Stubs\InMemoryAdapter; use Yiisoft\Queue\Tests\Unit\Middleware\Consume\Support\TestCallableMiddleware; use Yiisoft\Queue\Tests\Unit\Middleware\Consume\Support\TestMiddleware; @@ -161,7 +161,7 @@ public function handleConsume(ConsumeRequest $request): ConsumeRequest private function createDispatcher( ?ContainerInterface $container = null, ): ConsumeMiddlewareDispatcher { - $container ??= $this->createContainer([AdapterInterface::class => new FakeAdapter()]); + $container ??= $this->createContainer([AdapterInterface::class => new InMemoryAdapter()]); $callableFactory = new CallableFactory($container); return new ConsumeMiddlewareDispatcher( diff --git a/tests/Unit/Middleware/Consume/MiddlewareFactoryTest.php b/tests/Unit/Middleware/Consume/MiddlewareFactoryTest.php index 5a28283b..cbc7fb3e 100644 --- a/tests/Unit/Middleware/Consume/MiddlewareFactoryTest.php +++ b/tests/Unit/Middleware/Consume/MiddlewareFactoryTest.php @@ -18,7 +18,7 @@ use Yiisoft\Queue\Middleware\Consume\ConsumeMiddlewareFactoryInterface; use Yiisoft\Queue\Middleware\InvalidMiddlewareDefinitionException; use Yiisoft\Queue\QueueInterface; -use Yiisoft\Queue\Tests\App\FakeAdapter; +use Yiisoft\Queue\Stubs\InMemoryAdapter; use Yiisoft\Queue\Tests\Unit\Middleware\Consume\Support\CallableObjectMiddleware; use Yiisoft\Queue\Tests\Unit\Middleware\Consume\Support\InvalidController; use Yiisoft\Queue\Tests\Unit\Middleware\Consume\Support\StringCallableMiddleware; @@ -199,7 +199,7 @@ public function testInvalidMiddlewareWithWrongController(): void private function getMiddlewareFactory(?ContainerInterface $container = null): ConsumeMiddlewareFactoryInterface { - $container ??= $this->getContainer([AdapterInterface::class => new FakeAdapter()]); + $container ??= $this->getContainer([AdapterInterface::class => new InMemoryAdapter()]); return new ConsumeMiddlewareFactory($container, new CallableFactory($container)); } diff --git a/tests/Unit/Middleware/FailureHandling/MiddlewareDispatcherTest.php b/tests/Unit/Middleware/FailureHandling/MiddlewareDispatcherTest.php index 84008ba5..00f66c4c 100644 --- a/tests/Unit/Middleware/FailureHandling/MiddlewareDispatcherTest.php +++ b/tests/Unit/Middleware/FailureHandling/MiddlewareDispatcherTest.php @@ -16,7 +16,7 @@ use Yiisoft\Queue\Middleware\FailureHandling\FailureHandlerInterface; use Yiisoft\Queue\Middleware\FailureHandling\FailureMiddlewareFactory; use Yiisoft\Queue\QueueInterface; -use Yiisoft\Queue\Tests\App\FakeAdapter; +use Yiisoft\Queue\Stubs\InMemoryAdapter; use Yiisoft\Queue\Tests\Unit\Middleware\FailureHandling\Support\TestCallableMiddleware; use Yiisoft\Queue\Tests\Unit\Middleware\FailureHandling\Support\TestMiddleware; @@ -159,7 +159,7 @@ public function handleFailure(FailureHandlingRequest $request): FailureHandlingR private function createDispatcher( ?ContainerInterface $container = null, ): FailureMiddlewareDispatcher { - $container ??= $this->createContainer([AdapterInterface::class => new FakeAdapter()]); + $container ??= $this->createContainer([AdapterInterface::class => new InMemoryAdapter()]); $callableFactory = new CallableFactory($container); return new FailureMiddlewareDispatcher(new FailureMiddlewareFactory($container, $callableFactory), []); diff --git a/tests/Unit/Middleware/FailureHandling/MiddlewareFactoryTest.php b/tests/Unit/Middleware/FailureHandling/MiddlewareFactoryTest.php index b76a8a69..a46f08b7 100644 --- a/tests/Unit/Middleware/FailureHandling/MiddlewareFactoryTest.php +++ b/tests/Unit/Middleware/FailureHandling/MiddlewareFactoryTest.php @@ -20,7 +20,7 @@ use Yiisoft\Queue\Middleware\FailureHandling\FailureMiddlewareInterface; use Yiisoft\Queue\Middleware\InvalidMiddlewareDefinitionException; use Yiisoft\Queue\QueueInterface; -use Yiisoft\Queue\Tests\App\FakeAdapter; +use Yiisoft\Queue\Stubs\InMemoryAdapter; use Yiisoft\Queue\Tests\Unit\Middleware\FailureHandling\Support\CallableObjectMiddleware; use Yiisoft\Queue\Tests\Unit\Middleware\FailureHandling\Support\InvalidController; use Yiisoft\Queue\Tests\Unit\Middleware\FailureHandling\Support\StringCallableMiddleware; @@ -183,7 +183,7 @@ public function testInvalidMiddlewareWithWrongController(): void private function getMiddlewareFactory(?ContainerInterface $container = null): FailureMiddlewareFactoryInterface { - $container ??= $this->getContainer([AdapterInterface::class => new FakeAdapter()]); + $container ??= $this->getContainer([AdapterInterface::class => new InMemoryAdapter()]); return new FailureMiddlewareFactory($container, new CallableFactory($container)); } diff --git a/tests/Unit/Middleware/Push/AdapterPushHandlerTest.php b/tests/Unit/Middleware/Push/AdapterPushHandlerTest.php index 7bd61e26..b8e13c5b 100644 --- a/tests/Unit/Middleware/Push/AdapterPushHandlerTest.php +++ b/tests/Unit/Middleware/Push/AdapterPushHandlerTest.php @@ -7,19 +7,18 @@ use PHPUnit\Framework\TestCase; use Yiisoft\Queue\Message\GenericMessage; use Yiisoft\Queue\Middleware\Push\AdapterPushHandler; -use Yiisoft\Queue\Tests\App\FakeAdapter; +use Yiisoft\Queue\Stubs\InMemoryAdapter; final class AdapterPushHandlerTest extends TestCase { public function testHandlePushUsesAdapter(): void { - $adapter = new FakeAdapter(); + $adapter = new InMemoryAdapter(); $handler = new AdapterPushHandler($adapter); $message = new GenericMessage('handler', 'data'); - $result = $handler->handlePush($message); + $handler->handlePush($message); - self::assertSame($message, $result); - self::assertSame([$message], $adapter->pushMessages); + self::assertSame([$message], $adapter->getMessagesList()); } } diff --git a/tests/Unit/Middleware/Push/MiddlewareDispatcherTest.php b/tests/Unit/Middleware/Push/MiddlewareDispatcherTest.php index 62ce65c1..fbdc0ab7 100644 --- a/tests/Unit/Middleware/Push/MiddlewareDispatcherTest.php +++ b/tests/Unit/Middleware/Push/MiddlewareDispatcherTest.php @@ -15,7 +15,7 @@ use Yiisoft\Queue\Middleware\Push\PushHandlerInterface; use Yiisoft\Queue\Middleware\Push\PushMiddlewareFactory; use Yiisoft\Queue\Middleware\Push\PushMiddlewareDispatcher; -use Yiisoft\Queue\Tests\App\FakeAdapter; +use Yiisoft\Queue\Stubs\InMemoryAdapter; use Yiisoft\Queue\Tests\Unit\Middleware\Push\Support\TestCallableMiddleware; use Yiisoft\Queue\Tests\Unit\Middleware\Push\Support\TestMiddleware; @@ -140,7 +140,7 @@ public function testResetStackOnWithMiddlewares(): void private function createDispatcher( ?ContainerInterface $container = null, ): PushMiddlewareDispatcher { - $container ??= $this->createContainer([AdapterInterface::class => new FakeAdapter()]); + $container ??= $this->createContainer([AdapterInterface::class => new InMemoryAdapter()]); $callableFactory = new CallableFactory($container); return new PushMiddlewareDispatcher( diff --git a/tests/Unit/Middleware/Push/MiddlewareFactoryTest.php b/tests/Unit/Middleware/Push/MiddlewareFactoryTest.php index 80f99b73..08cbf696 100644 --- a/tests/Unit/Middleware/Push/MiddlewareFactoryTest.php +++ b/tests/Unit/Middleware/Push/MiddlewareFactoryTest.php @@ -17,7 +17,7 @@ use Yiisoft\Queue\Middleware\Push\PushMiddlewareFactory; use Yiisoft\Queue\Middleware\Push\PushMiddlewareFactoryInterface; use Yiisoft\Queue\Middleware\Push\PushMiddlewareInterface; -use Yiisoft\Queue\Tests\App\FakeAdapter; +use Yiisoft\Queue\Stubs\InMemoryAdapter; use Yiisoft\Queue\Tests\Unit\Middleware\Push\Support\CallableObjectMiddleware; use Yiisoft\Queue\Tests\Unit\Middleware\Push\Support\InvalidController; use Yiisoft\Queue\Tests\Unit\Middleware\Push\Support\StringCallableMiddleware; @@ -173,7 +173,7 @@ public function testInvalidMiddlewareWithWrongController(): void private function getMiddlewareFactory(?ContainerInterface $container = null): PushMiddlewareFactoryInterface { - $container ??= $this->getContainer([AdapterInterface::class => new FakeAdapter()]); + $container ??= $this->getContainer([AdapterInterface::class => new InMemoryAdapter()]); return new PushMiddlewareFactory($container, new CallableFactory($container)); } diff --git a/tests/Unit/QueueTest.php b/tests/Unit/QueueTest.php index 133b9298..4cccc86e 100644 --- a/tests/Unit/QueueTest.php +++ b/tests/Unit/QueueTest.php @@ -9,7 +9,6 @@ use Yiisoft\Queue\Message\GenericMessage; use Yiisoft\Queue\MessageStatus; use Yiisoft\Queue\Stubs\InMemoryAdapter; -use Yiisoft\Queue\Tests\App\FakeAdapter; use Yiisoft\Queue\Tests\TestCase; use function extension_loaded; @@ -25,12 +24,12 @@ final class QueueTest extends TestCase { public function testPushSuccessful(): void { - $adapter = new FakeAdapter(); + $adapter = new InMemoryAdapter(); $queue = $this->createQueue($adapter); $message = new GenericMessage('simple', null); $queue->push($message); - self::assertSame([$message], $adapter->pushMessages); + self::assertSame([$message], $adapter->getMessagesList()); } public function testPushSynchronouslyProcessesMessage(): void