Merge pull request #829 from wmde/evil-char-mails

Allow weird evil characeters in email domains

src/Infrastructure/Messenger.php

@@ -44,10 +44,11 @@ public function sendMessageToOperator( Message $messageContent, EmailAddress $re
 	private function createMessage( Message $messageContent, EmailAddress $recipient,
 									EmailAddress $replyTo = null ): Swift_Message {
 		$message = Swift_Message::newInstance( $messageContent->getSubject(), $messageContent->getMessageBody() );
-		$message->setFrom( $this->operatorAddress->getFullAddress(), $this->operatorName );
-		$message->setTo( $recipient->getFullAddress() );
+		$message->setFrom( $this->operatorAddress->getNormalizedAddress(), $this->operatorName );
+		$message->setTo( $recipient->getNormalizedAddress() );
+
 		if ( $replyTo ) {
-			$message->setReplyTo( $replyTo->getFullAddress() );
+			$message->setReplyTo( $replyTo->getNormalizedAddress() );
 		}
 
 		return $message;

tests/Unit/Infrastructure/MessengerTest.php

@@ -18,9 +18,7 @@
 class MessengerTest extends \PHPUnit\Framework\TestCase {
 
 	public function testWhenSendReturnsZero_exceptionIsThrown() {
-		$mailTransport = $this->getMockBuilder( Swift_NullTransport::class )
-			->disableOriginalConstructor()
-			->getMock();
+		$mailTransport = $this->newMailTransport();
 
 		$mailTransport->expects( $this->once() )
 			->method( 'send' )
@@ -35,4 +33,24 @@ public function testWhenSendReturnsZero_exceptionIsThrown() {
 			);
 	}
 
+	private function newMailTransport() {
+		return $this->getMockBuilder( Swift_NullTransport::class )
+			->disableOriginalConstructor()
+			->getMock();
+	}
+
+	public function testSendToAddressWithInternationalCharacters_doesNotCauseException() {
+		$messenger = new Messenger(
+			$this->newMailTransport(),
+			new EmailAddress( 'hostmaster@thatoperator.com' )
+		);
+
+		$messenger->sendMessageToUser(
+			new Message( 'Test message', 'Test content' ),
+			new EmailAddress( 'info@müllerrr.de' )
+		);
+
+		$this->assertTrue( true );
+	}
+
 }