rename onPreDriverSend to onDriverPreSend. split getCommandOrTopic into two getters.

Author: makasim

pkg/enqueue/Client/ChainExtension.php

@@ -31,10 +31,10 @@ public function onPreSendCommand(PreSend $event): void
         }
     }
 
-    public function onPreDriverSend(PreDriverSend $context): void
+    public function onDriverPreSend(DriverPreSend $context): void
     {
         foreach ($this->extensions as $extension) {
-            $extension->onPreDriverSend($context);
+            $extension->onDriverPreSend($context);
         }
     }
 

pkg/enqueue/Client/ConsumptionExtension/ExclusiveCommandExtension.php

@@ -64,7 +64,7 @@ public function onPreReceived(Context $context)
     public function onPreSendCommand(PreSend $context): void
     {
         $message = $context->getMessage();
-        $command = $context->getCommandOrTopic();
+        $command = $context->getCommand();
 
         if (array_key_exists($command, $this->processorNameToQueueNameMap)) {
             $message->setProperty(Config::PARAMETER_PROCESSOR_NAME, $command);

pkg/enqueue/Client/PreDriverSend.php renamed to pkg/enqueue/Client/DriverPreSend.php

@@ -2,7 +2,7 @@
 
 namespace Enqueue\Client;
 
-class PreDriverSend
+class DriverPreSend
 {
     private $message;
 

pkg/enqueue/Client/EmptyExtensionTrait.php

@@ -12,7 +12,7 @@ public function onPreSendCommand(PreSend $context): void
     {
     }
 
-    public function onPreDriverSend(PreDriverSend $context): void
+    public function onDriverPreSend(DriverPreSend $context): void
     {
     }
 

pkg/enqueue/Client/ExtensionInterface.php

@@ -8,7 +8,7 @@ public function onPreSendEvent(PreSend $context): void;
 
     public function onPreSendCommand(PreSend $context): void;
 
-    public function onPreDriverSend(PreDriverSend $context): void;
+    public function onDriverPreSend(DriverPreSend $context): void;
 
     public function onPostSend(PostSend $context): void;
 

pkg/enqueue/Client/PreSend.php

@@ -28,14 +28,24 @@ public function __construct(
         $this->originalMessage = clone $message;
     }
 
-    public function getCommandOrTopic(): string
+    public function getCommand(): string
     {
         return $this->commandOrTopic;
     }
 
-    public function changeCommandOrTopic(string $commandOrTopic): void
+    public function getTopic(): string
     {
-        $this->commandOrTopic = $commandOrTopic;
+        return $this->commandOrTopic;
+    }
+
+    public function changeCommand(string $newCommand): void
+    {
+        $this->commandOrTopic = $newCommand;
+    }
+
+    public function changeTopic(string $newTopic): void
+    {
+        $this->commandOrTopic = $newTopic;
     }
 
     public function changeBody($body, string $contentType = null): void

pkg/enqueue/Client/Producer.php

@@ -51,7 +51,7 @@ public function sendEvent($topic, $message)
         $preSend = new PreSend($topic, $message, $this, $this->driver);
         $this->extension->onPreSendEvent($preSend);
 
-        $topic = $preSend->getCommandOrTopic();
+        $topic = $preSend->getTopic();
         $message = $preSend->getMessage();
 
         $message->setProperty(Config::PARAMETER_TOPIC_NAME, $topic);
@@ -68,7 +68,7 @@ public function sendCommand($command, $message, $needReply = false)
         $preSend = new PreSend($command, $message, $this, $this->driver);
         $this->extension->onPreSendEvent($preSend);
 
-        $command = $preSend->getCommandOrTopic();
+        $command = $preSend->getCommand();
         $message = $preSend->getMessage();
 
         $deleteReplyQueue = false;
@@ -137,7 +137,7 @@ private function doSend(Message $message)
                 throw new \LogicException(sprintf('The %s property must not be set for messages that are sent to message bus.', Config::PARAMETER_PROCESSOR_NAME));
             }
 
-            $this->extension->onPreDriverSend(new PreDriverSend($message, $this, $this->driver));
+            $this->extension->onPreDriverSend(new DriverPreSend($message, $this, $this->driver));
             $this->driver->sendToRouter($message);
         } elseif (Message::SCOPE_APP == $message->getScope()) {
             if (false == $message->getProperty(Config::PARAMETER_PROCESSOR_NAME)) {
@@ -147,7 +147,7 @@ private function doSend(Message $message)
                 $message->setProperty(Config::PARAMETER_PROCESSOR_QUEUE_NAME, $this->driver->getConfig()->getRouterQueueName());
             }
 
-            $this->extension->onPreDriverSend(new PreDriverSend($message, $this, $this->driver));
+            $this->extension->onPreDriverSend(new DriverPreSend($message, $this, $this->driver));
             $this->driver->sendToRouter($message);
         } else {
             throw new \LogicException(sprintf('The message scope "%s" is not supported.', $message->getScope()));