rename

Author: vjik

docs/guide/en/configuration-manual.md

@@ -79,7 +79,7 @@ $queue = new Queue(
 );
 
 // Now you can push messages
-$message = new \Yiisoft\Queue\Message\SimpleMessage('file-download', ['url' => 'https://example.com/file.pdf']);
+$message = new \Yiisoft\Queue\Message\GenericMessage('file-download', ['url' => 'https://example.com/file.pdf']);
 $queue->push($message);
 ```
 

docs/guide/en/message-handler-advanced.md

@@ -17,9 +17,9 @@ Handler definitions are configured in:
 Use a short stable message type when pushing a `Message` instead of a PHP class name:
 
 ```php
-use Yiisoft\Queue\Message\SimpleMessage;
+use Yiisoft\Queue\Message\GenericMessage;
 
-new SimpleMessage('send-email', ['data' => '...']); // "send-email" is the message type here
+new GenericMessage('send-email', ['data' => '...']); // "send-email" is the message type here
 ```
 
 **Config**:

docs/guide/en/message-handler.md

@@ -13,7 +13,7 @@ If your handler implements `Yiisoft\Queue\Message\MessageHandlerInterface`, you
 **Message**:
 
 ```php
-new \Yiisoft\Queue\Message\SimpleMessage(\App\Queue\RemoteFileHandler::class, ['url' => '...']);
+new \Yiisoft\Queue\Message\GenericMessage(\App\Queue\RemoteFileHandler::class, ['url' => '...']);
 ```
 
 **Handler**:

docs/guide/en/messages-and-handlers.md

@@ -33,7 +33,7 @@ This means the producer and consumer can be:
 A message carries just enough data to perform the work:
 
 ```php
-new \Yiisoft\Queue\Message\SimpleMessage('send-email', [
+new \Yiisoft\Queue\Message\GenericMessage('send-email', [
     'to'      => 'user@example.com',
     'subject' => 'Welcome',
 ]);

docs/guide/en/queue-names.md

@@ -68,7 +68,7 @@ Pushing a message via DI:
 
 ```php
 use Yiisoft\Queue\QueueInterface;
-use Yiisoft\Queue\Message\SimpleMessage;
+use Yiisoft\Queue\Message\GenericMessage;
 
 final readonly class SendWelcomeEmail
 {
@@ -78,7 +78,7 @@ final readonly class SendWelcomeEmail
 
     public function run(string $email): void
     {
-        $this->queue->push(new SimpleMessage('send-email', ['to' => $email]));
+        $this->queue->push(new GenericMessage('send-email', ['to' => $email]));
     }
 }
 ```
@@ -105,7 +105,7 @@ If you have multiple queue names, inject `QueueProviderInterface` and call `get(
 
 ```php
 use Yiisoft\Queue\Provider\QueueProviderInterface;
-use Yiisoft\Queue\Message\SimpleMessage;
+use Yiisoft\Queue\Message\GenericMessage;
 
 final readonly class SendTransactionalEmail
 {
@@ -117,7 +117,7 @@ final readonly class SendTransactionalEmail
     {
         $this->queueProvider
             ->get('emails')
-            ->push(new SimpleMessage('send-email', ['to' => $email]));
+            ->push(new GenericMessage('send-email', ['to' => $email]));
     }
 }
 ```

docs/guide/en/usage.md

@@ -5,7 +5,7 @@
 For example, if you need to download and save a file, you can create a message like this:
 
 ```php
-$message = new \Yiisoft\Queue\Message\SimpleMessage(
+$message = new \Yiisoft\Queue\Message\GenericMessage(
     RemoteFileHandler::class,
     ['url' => $url, 'destinationFile' => $filename]
 );

src/Message/SimpleMessage.php src/Message/GenericMessage.phpsrc/Message/SimpleMessage.php renamed to src/Message/GenericMessage.php

@@ -4,7 +4,7 @@
 
 namespace Yiisoft\Queue\Message;
 
-final class SimpleMessage extends Message
+final class GenericMessage extends Message
 {
     /**
      * @param string $type A message type used to resolve the handler.

src/Message/JsonMessageSerializer.php

@@ -54,10 +54,10 @@ public function unserialize(string $value): MessageInterface
             throw new InvalidArgumentException('Metadata must be an array. Got ' . get_debug_type($meta) . '.');
         }
 
-        $class = $meta['message-class'] ?? SimpleMessage::class;
+        $class = $meta['message-class'] ?? GenericMessage::class;
         // Don't check subclasses when it's a default class: that's faster
-        if ($class !== SimpleMessage::class && !is_subclass_of($class, MessageInterface::class)) {
-            $class = SimpleMessage::class;
+        if ($class !== GenericMessage::class && !is_subclass_of($class, MessageInterface::class)) {
+            $class = GenericMessage::class;
         }
 
         /**

tests/Benchmark/MetadataBench.php

@@ -7,7 +7,7 @@
 use Generator;
 use PhpBench\Attributes\ParamProviders;
 use Yiisoft\Queue\Message\IdEnvelope;
-use Yiisoft\Queue\Message\SimpleMessage;
+use Yiisoft\Queue\Message\GenericMessage;
 use Yiisoft\Queue\Message\MessageInterface;
 use Yiisoft\Queue\Middleware\FailureHandling\FailureEnvelope;
 
@@ -18,7 +18,7 @@ final class MetadataBench
      */
     public function benchArrayRead(): void
     {
-        $message = (new SimpleMessage('foo', 'bar'))->withMetadata(['id' => 1]);
+        $message = (new GenericMessage('foo', 'bar'))->withMetadata(['id' => 1]);
         $id = $message->getMetadata()['id'];
     }
 
@@ -27,7 +27,7 @@ public function benchArrayRead(): void
      */
     public function benchEnvelopeRead(): void
     {
-        $message = new IdEnvelope(new SimpleMessage('foo', 'bar'), 1);
+        $message = new IdEnvelope(new GenericMessage('foo', 'bar'), 1);
         $id = $message->getId();
     }
 
@@ -36,14 +36,14 @@ public function benchEnvelopeRead(): void
      */
     public function benchEnvelopeReadRestored(): void
     {
-        $message = IdEnvelope::fromMessage((new SimpleMessage('foo', 'bar'))->withMetadata(['id' => 1]));
+        $message = IdEnvelope::fromMessage((new GenericMessage('foo', 'bar'))->withMetadata(['id' => 1]));
         $id = $message->getId();
     }
 
     public function provideEnvelopeStack(): Generator
     {
         $config = [1 => 'one', 5 => 'five', 15 => 'fifteen'];
-        $message = new IdEnvelope(new SimpleMessage('foo', 'bar'), 1);
+        $message = new IdEnvelope(new GenericMessage('foo', 'bar'), 1);
 
         for ($i = 1; $i <= max(...array_keys($config)); $i++) {
             if (isset($config[$i])) {
@@ -79,7 +79,7 @@ public function provideEnvelopeStackCounts(): Generator
     #[ParamProviders('provideEnvelopeStackCounts')]
     public function benchEnvelopeStackCreation(array $params): void
     {
-        $message = new SimpleMessage('foo', 'bar');
+        $message = new GenericMessage('foo', 'bar');
         for ($i = 0; $i < $params[0]; $i++) {
             $message = new FailureEnvelope($message, ["fail$i" => "fail$i"]);
         }
@@ -97,6 +97,6 @@ public function benchMetadataArrayCreation(array $params): void
         for ($i = 0; $i < $params[0]; $i++) {
             $metadata['failure-meta']["fail$i"] = "fail$i";
         }
-        $message = (new SimpleMessage('foo', 'bar'))->withMetadata($metadata);
+        $message = (new GenericMessage('foo', 'bar'))->withMetadata($metadata);
     }
 }

tests/Benchmark/QueueBench.php

@@ -11,7 +11,7 @@
 use Yiisoft\Queue\Cli\SimpleLoop;
 use Yiisoft\Queue\Message\IdEnvelope;
 use Yiisoft\Queue\Message\JsonMessageSerializer;
-use Yiisoft\Queue\Message\SimpleMessage;
+use Yiisoft\Queue\Message\GenericMessage;
 use Yiisoft\Queue\Middleware\CallableFactory;
 use Yiisoft\Queue\Middleware\Consume\ConsumeMiddlewareDispatcher;
 use Yiisoft\Queue\Middleware\Consume\ConsumeMiddlewareFactory;
@@ -66,11 +66,11 @@ public function __construct()
 
     public function providePush(): Generator
     {
-        yield 'simple' => ['message' => new SimpleMessage('foo', 'bar')];
+        yield 'simple' => ['message' => new GenericMessage('foo', 'bar')];
         yield 'with envelopes' => [
             'message' => new FailureEnvelope(
                 new IdEnvelope(
-                    new SimpleMessage('foo', 'bar'),
+                    new GenericMessage('foo', 'bar'),
                     'test id',
                 ),
                 ['failure-1' => ['a', 'b', 'c']],
@@ -86,12 +86,12 @@ public function benchPush(array $params): void
 
     public function provideConsume(): Generator
     {
-        yield 'simple mapping' => ['message' => $this->serializer->serialize(new SimpleMessage('foo', 'bar'))];
+        yield 'simple mapping' => ['message' => $this->serializer->serialize(new GenericMessage('foo', 'bar'))];
         yield 'with envelopes mapping' => [
             'message' => $this->serializer->serialize(
                 new FailureEnvelope(
                     new IdEnvelope(
-                        new SimpleMessage('foo', 'bar'),
+                        new GenericMessage('foo', 'bar'),
                         'test id',
                     ),
                     ['failure-1' => ['a', 'b', 'c']],