Added typehints

src/AsyncMessageQueueManager.php

@@ -72,11 +72,7 @@ public function __construct(
 		$this->minIntervalPromise = \React\Promise\resolve();
 	}
 
-	/**
-	 * @param mixed $message
-	 * @return \React\Promise\ExtendedPromiseInterface
-	 */
-	public function send($message): \React\Promise\ExtendedPromiseInterface
+	public function send(AsyncMessage $message): \React\Promise\ExtendedPromiseInterface
 	{
 		static $requestsCounter = 0;
 		$previousRequestsCount = $requestsCounter;

src/AsyncMessageSender.php

@@ -5,14 +5,9 @@
 interface AsyncMessageSender
 {
 
-	/**
-	 * @param \AsyncConnection\AsyncConnectionWriter $writer
-	 * @param mixed $message
-	 * @return \React\Promise\ExtendedPromiseInterface
-	 */
 	public function sendMessage(
 		AsyncConnectionWriter $writer,
-		$message
+		AsyncMessage $message
 	): \React\Promise\ExtendedPromiseInterface;
 
 }

src/SimpleAsyncMessage.php

@@ -0,0 +1,21 @@
+<?php declare(strict_types = 1);
+
+namespace AsyncConnection;
+
+class SimpleAsyncMessage extends \Consistence\ObjectPrototype implements AsyncMessage
+{
+
+	/** @var string */
+	private $text;
+
+	public function __construct(string $text)
+	{
+		$this->text = $text;
+	}
+
+	public function getText(): string
+	{
+		return $this->text;
+	}
+
+}

src/Smtp/AsyncSmtpMessageSender.php

@@ -3,18 +3,16 @@
 namespace AsyncConnection\Smtp;
 
 use AsyncConnection\AsyncConnectionWriter;
+use AsyncConnection\AsyncMessage;
 
 class AsyncSmtpMessageSender extends \Consistence\ObjectPrototype implements \AsyncConnection\AsyncMessageSender
 {
 
-	/**
-	 * @param \AsyncConnection\AsyncConnectionWriter $writer
-	 * @param mixed $message
-	 * @return \React\Promise\ExtendedPromiseInterface
-	 */
-	public function sendMessage(AsyncConnectionWriter $writer, $message): \React\Promise\ExtendedPromiseInterface
+	public function sendMessage(AsyncConnectionWriter $writer, AsyncMessage $message): \React\Promise\ExtendedPromiseInterface
 	{
-		\Consistence\Type\Type::checkType($message, \Nette\Mail\Message::class);
+		if (!$message instanceof \Nette\Mail\Message) {
+			throw new \InvalidArgumentException('Only \Nette\Mail\Message is accepted');
+		}
 
 		$from = $message->getHeader('Return-Path') ?? key($message->getHeader('From'));
 

src/Smtp/MailMessage.php

@@ -0,0 +1,13 @@
+<?php declare(strict_types = 1);
+
+namespace AsyncConnection\Smtp;
+
+class MailMessage extends \Nette\Mail\Message implements \AsyncConnection\AsyncMessage
+{
+
+	public function getText(): string
+	{
+		return $this->getBody() ?? 'undefined';
+	}
+
+}

tests/AsyncMessageQueueManagerTest.php

@@ -170,7 +170,7 @@ function (): \React\Promise\ExtendedPromiseInterface {
 		$this->exceptions = [];
 
 		$manager = $this->createManager();
-		$manager->send('a')->done(
+		$manager->send(new SimpleAsyncMessage('a'))->done(
 			function (): void {
 				$this->exceptions['first'] = false;
 			},
@@ -182,7 +182,7 @@ function (\Throwable $e): void {
 		$this->assertSame(1, $manager->getQueuedMessagesCount(), 'Unexpected queued messages count.');
 		$this->assertSame(0, $manager->getSentMessagesCount(), 'Unexpected sent messages count');
 
-		$manager->send('b')->done(
+		$manager->send(new SimpleAsyncMessage('b'))->done(
 			function (): void {
 				$this->exceptions['second'] = false;
 			},
@@ -195,8 +195,8 @@ function (\Throwable $e): void {
 		$firstMessage = array_shift($messages);
 		$lastMessage = array_pop($messages);
 		$this->assertSame(2, $manager->getQueuedMessagesCount(), 'Unexpected queued messages count.');
-		$this->assertSame('a', $firstMessage, 'Unexpected first emails subject');
-		$this->assertSame('b', $lastMessage, 'Unexpected second emails subject');
+		$this->assertSame('a', $firstMessage->getText(), 'Unexpected first emails subject');
+		$this->assertSame('b', $lastMessage->getText(), 'Unexpected second emails subject');
 
 		$this->loop->addPeriodicTimer($this->getTimerInterval(), function () use ($manager): void {
 			if (isset($this->exceptions['second'])) {
@@ -219,7 +219,7 @@ function (\Throwable $e): void {
 						$this->assertSame(1, $manager->getQueuedMessagesCount(), 'Unexpected queued messages count.');
 						$messages = $manager->getQueuedMessages();
 						$message = array_shift($messages);
-						$this->assertSame('b', $message);
+						$this->assertSame('b', $message->getText());
 						$this->assertSame(1, $manager->getSentMessagesCount(), 'Unexpected sent messages count');
 
 					} catch (\Throwable $e) {
@@ -243,7 +243,7 @@ public function testSendingWhenPreviousRequestSucceeded(): void
 
 		$manager = $this->createManager();
 
-		$manager->send('message')
+		$manager->send(new SimpleAsyncMessage('message'))
 			->done(
 				function (): void {
 				},
@@ -252,7 +252,7 @@ function (\Throwable $e): void {
 				}
 			);
 
-		$manager->send('message')
+		$manager->send(new SimpleAsyncMessage('message'))
 			->done(
 				function (): void {
 					$this->setException(false);
@@ -350,7 +350,7 @@ private function runSuccessfulSendingTest(
 		?\Closure $assertOnSuccess = null
 	): void
 	{
-		$manager->send($message)
+		$manager->send(new SimpleAsyncMessage($message))
 			->done(
 				function (): void {
 					$this->setException(false);
@@ -370,7 +370,7 @@ private function runFailedSendingTest(
 		\Closure $assertOnFail
 	): void
 	{
-		$manager->send($message)
+		$manager->send(new SimpleAsyncMessage($message))
 			->done(
 				function (): void {
 					$this->setException(false);
@@ -408,7 +408,7 @@ private function runDisconnectionTest(
 
 		$manager = $this->createManager($maxIntervalBetweenMessages, $maxMessagesPerConnection);
 
-		$manager->send('message')
+		$manager->send(new SimpleAsyncMessage('message'))
 			->then(
 				function () use ($manager, $maxIntervalBetweenMessages): void {
 					try {
@@ -418,7 +418,7 @@ function () use ($manager, $maxIntervalBetweenMessages): void {
 							sleep($maxIntervalBetweenMessages + 1);
 						}
 
-						$manager->send('message')
+						$manager->send(new SimpleAsyncMessage('message'))
 							->done(
 								function (): void {
 									$this->setException(false);
@@ -448,7 +448,7 @@ function (\Throwable $e): void {
 	private function runTwoRequestsTest(\Closure $asserts): void
 	{
 		$manager = $this->createManager();
-		$manager->send('message')
+		$manager->send(new SimpleAsyncMessage('message'))
 			->done(
 				function (): void {
 					$this->exceptions['first'] = false;
@@ -458,7 +458,7 @@ function (\Throwable $e): void {
 				}
 			);
 
-		$manager->send('message')
+		$manager->send(new SimpleAsyncMessage('message'))
 			->done(
 				function (): void {
 					$this->exceptions['second'] = false;

tests/Smtp/AsyncSmtpMailerIntegrationTest.php

@@ -81,11 +81,11 @@ private function getManager(): AsyncMessageQueueManager
 		);
 	}
 
-	private function getMessage(string $subject): \Nette\Mail\Message
+	private function getMessage(string $subject): \AsyncConnection\Smtp\MailMessage
 	{
 		$settings = $this->getSettings();
 
-		$message = new \Nette\Mail\Message();
+		$message = new MailMessage();
 		$message->setFrom($settings->getEmailFrom());
 		$message->setSubject($subject);
 		$message->setHeader('To', [$settings->getTestInboxSettings()->getUsername() => null]);

tests/Smtp/AsyncSmtpMessageSenderTest.php

@@ -101,7 +101,7 @@ public function testMultipleRecipients(): void
 	}
 
 	private function runSuccessfulSendingTest(
-		\Nette\Mail\Message $message,
+		MailMessage $message,
 		?\Closure $assertOnSuccess = null
 	): void
 	{
@@ -120,7 +120,7 @@ function (\Throwable $exception): void {
 	}
 
 	private function runFailedSendingTest(
-		\Nette\Mail\Message $message,
+		MailMessage $message,
 		string $errorMessage,
 		\Closure $assertOnFail
 	): void
@@ -139,9 +139,9 @@ function (\Throwable $exception): void {
 		$this->runFailedTest($this->loop, $assertOnFail, $errorMessage);
 	}
 
-	private function createMessage(?string $subject = 'TEST'): \Nette\Mail\Message
+	private function createMessage(?string $subject = 'TEST'): MailMessage
 	{
-		$message = new \Nette\Mail\Message();
+		$message = new MailMessage();
 		$message->setFrom('test@slevomat.cz');
 		$message->setSubject($subject);
 		$message->setHeader('To', ['test@seznam.cz' => null]);