Remove FakeAdapter (#303)

Author: vjik

stubs/InMemoryAdapter.php

@@ -29,6 +29,15 @@ final class InMemoryAdapter implements AdapterInterface
     private array $messages = [];
     private int $current = 0;
 
+    /**
+     * @return MessageInterface[]
+     * @psalm-return list<MessageInterface>
+     */
+    public function getMessagesList(): array
+    {
+        return array_values($this->messages);
+    }
+
     public function push(MessageInterface $message): MessageInterface
     {
         $id = count($this->messages) + $this->current;

tests/App/FakeAdapter.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(

tests/Unit/Middleware/Consume/MiddlewareDispatcherTest.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));
     }

tests/Unit/Middleware/Consume/MiddlewareFactoryTest.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), []);

tests/Unit/Middleware/FailureHandling/MiddlewareDispatcherTest.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));
     }

tests/Unit/Middleware/FailureHandling/MiddlewareFactoryTest.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());
     }
 }

tests/Unit/Middleware/Push/AdapterPushHandlerTest.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(

tests/Unit/Middleware/Push/MiddlewareDispatcherTest.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));
     }

tests/Unit/Middleware/Push/MiddlewareFactoryTest.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