Merge pull request #47 from dotkernel/issue-46

Issue #46: Changed ExampleMessage and ExampleMessageHandler to Message and MessageHandler

Author: arhimede

config/autoload/templates.global.php

@@ -10,8 +10,7 @@
     displayDetailsOnTestsThatTriggerErrors="true"
     displayDetailsOnTestsThatTriggerNotices="true"
     displayDetailsOnTestsThatTriggerWarnings="true"
-    colors="true"
->
+    colors="true">
     <testsuites>
         <testsuite name="default">
             <directory>./test</directory>

phpunit.xml.dist

@@ -10,8 +10,8 @@
 use Netglue\PsrContainer\Messenger\Container\Middleware\MessageHandlerMiddlewareStaticFactory;
 use Netglue\PsrContainer\Messenger\Container\Middleware\MessageSenderMiddlewareStaticFactory;
 use Netglue\PsrContainer\Messenger\HandlerLocator\OneToManyFqcnContainerHandlerLocator;
-use Queue\App\Message\ExampleMessage;
-use Queue\App\Message\ExampleMessageHandler;
+use Queue\App\Message\Message;
+use Queue\App\Message\MessageHandler;
 use Symfony\Component\Messenger\MessageBusInterface;
 
 class ConfigProvider
@@ -25,7 +25,6 @@ public function __invoke(): array
                     'buses' => $this->busConfig(),
                 ],
             ],
-            'templates'    => $this->getTemplates(),
         ];
     }
 
@@ -37,23 +36,14 @@ private function getDependencies(): array
                 "message_bus_stamp_middleware"   => [BusNameStampMiddlewareStaticFactory::class, "message_bus"],
                 "message_bus_sender_middleware"  => [MessageSenderMiddlewareStaticFactory::class, "message_bus"],
                 "message_bus_handler_middleware" => [MessageHandlerMiddlewareStaticFactory::class, "message_bus"],
-                ExampleMessageHandler::class     => AttributedServiceFactory::class,
+                MessageHandler::class            => AttributedServiceFactory::class,
             ],
             "aliases"   => [
                 MessageBusInterface::class => "message_bus",
             ],
         ];
     }
 
-    public function getTemplates(): array
-    {
-        return [
-            'paths' => [
-                'notification-email' => [__DIR__ . '/templates'],
-            ],
-        ];
-    }
-
     private function busConfig(): array
     {
         return [
@@ -81,7 +71,7 @@ private function busConfig(): array
                  */
                 'handler_locator' => OneToManyFqcnContainerHandlerLocator::class,
                 'handlers'        => [
-                    ExampleMessage::class => [ExampleMessageHandler::class],
+                    Message::class => [MessageHandler::class],
                 ],
 
                 /**
@@ -97,7 +87,7 @@ private function busConfig(): array
                  * Route specific messages to specific transports by using the message name as the key.
                  */
                 'routes' => [
-                    ExampleMessage::class => ["redis_transport"],
+                    Message::class => ["redis_transport"],
                 ],
             ],
         ];

src/App/ConfigProvider.php

@@ -4,7 +4,7 @@
 
 namespace Queue\App\Message;
 
-class ExampleMessage
+class Message
 {
     public function __construct(
         private array $payload,

src/App/Message/ExampleMessage.php src/App/Message/Message.phpsrc/App/Message/ExampleMessage.php renamed to src/App/Message/Message.php

@@ -10,7 +10,7 @@
 use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Component\Messenger\Stamp\DelayStamp;
 
-class ExampleMessageHandler
+class MessageHandler
 {
     #[Inject(
         MessageBusInterface::class,
@@ -24,7 +24,7 @@ public function __construct(
     ) {
     }
 
-    public function __invoke(ExampleMessage $message): void
+    public function __invoke(Message $message): void
     {
         $payload = $message->getPayload();
 
@@ -50,21 +50,21 @@ public function __invoke(ExampleMessage $message): void
     public function retry(array $payload): void
     {
         if (! isset($payload['retry'])) {
-            $this->bus->dispatch(new ExampleMessage(["foo" => $payload['foo'], 'retry' => 1]), [
+            $this->bus->dispatch(new Message(["foo" => $payload['foo'], 'retry' => 1]), [
                 new DelayStamp($this->config['fail-safe']['first_retry']),
             ]);
         } else {
             $retry = $payload['retry'];
             switch ($retry) {
                 case 1:
                     $delay = $this->config['fail-safe']['second_retry'];
-                    $this->bus->dispatch(new ExampleMessage(["foo" => $payload['foo'], 'retry' => ++$retry]), [
+                    $this->bus->dispatch(new Message(["foo" => $payload['foo'], 'retry' => ++$retry]), [
                         new DelayStamp($delay),
                     ]);
                     break;
                 case 2:
                     $delay = $this->config['fail-safe']['third_retry'];
-                    $this->bus->dispatch(new ExampleMessage(["foo" => $payload['foo'], 'retry' => ++$retry]), [
+                    $this->bus->dispatch(new Message(["foo" => $payload['foo'], 'retry' => ++$retry]), [
                         new DelayStamp($delay),
                     ]);
                     break;

src/App/Message/ExampleMessageHandler.php src/App/Message/MessageHandler.phpsrc/App/Message/ExampleMessageHandler.php renamed to src/App/Message/MessageHandler.php

@@ -5,7 +5,7 @@
 namespace Queue\Swoole\Delegators;
 
 use Psr\Container\ContainerInterface;
-use Queue\App\Message\ExampleMessage;
+use Queue\App\Message\Message;
 use Queue\Swoole\Command\GetFailedMessagesCommand;
 use Queue\Swoole\Command\GetProcessedMessagesCommand;
 use Queue\Swoole\Command\GetQueuedMessagesCommand;
@@ -79,8 +79,8 @@ public function __invoke(ContainerInterface $container, string $serviceName, cal
                     $logger->error("Error running command: " . $e->getMessage());
                 }
             } else {
-                $bus->dispatch(new ExampleMessage(["foo" => $message]));
-                $bus->dispatch(new ExampleMessage(["foo" => "with 5 seconds delay"]), [
+                $bus->dispatch(new Message(["foo" => $message]));
+                $bus->dispatch(new Message(["foo" => "with 5 seconds delay"]), [
                     new DelayStamp(5000),
                 ]);