Merge pull request #54 from rpkamp/fix-headers

Always pass Headers to new Messages

Author: rpkamp

composer.json

@@ -33,7 +33,7 @@
         "phpmd/phpmd": "^2.9.1",
         "phpunit/phpunit": "^8.0",
         "php-http/curl-client": "^2.0",
-        "swiftmailer/swiftmailer": "^6.2.3",
+        "swiftmailer/swiftmailer": "6.2.3",
         "phpstan/phpstan": "^0.12.64",
         "pdepend/pdepend": "^2.5",
         "nyholm/psr7": "^1.2",

src/Message/Message.php

@@ -51,13 +51,12 @@ class Message
     public $attachments;
 
     /**
-     * @var array<string, array<int, string>>|null
+     * @var Headers
      */
     public $headers;
 
     /**
-     * @param Attachment[]                           $attachments
-     * @param \rpkamp\Mailhog\Message\Headers        $headers
+     * @param Attachment[] $attachments
      */
     public function __construct(
         string $messageId,

src/Specification/HeaderSpecification.php

@@ -25,8 +25,7 @@ public function __construct(string $headerName, ?string $headerValue = null)
 
     public function isSatisfiedBy(Message $message): bool
     {
-        return
-            $this->headerValue
+        return $this->headerValue
             ? $message->headers->get($this->headerName) === $this->headerValue
             : $message->headers->has($this->headerName);
     }

tests/unit/Message/MessageTest.php

@@ -6,6 +6,7 @@
 use InvalidArgumentException;
 use rpkamp\Mailhog\Message\Contact;
 use rpkamp\Mailhog\Message\ContactCollection;
+use rpkamp\Mailhog\Message\Headers;
 use rpkamp\Mailhog\Message\Message;
 use PHPUnit\Framework\TestCase;
 use rpkamp\Mailhog\Message\Mime\Attachment;
@@ -22,6 +23,7 @@ public function it_should_return_values_it_was_instantiated_with(): void
         $attachments = [
             new Attachment('lorem-ipsum.text', 'text/plain', 'Lorem ipsum dolor sit amet!')
         ];
+        $headers = new Headers(['foo' => 'bar']);
 
         $message = new Message(
             '123',
@@ -31,7 +33,8 @@ public function it_should_return_values_it_was_instantiated_with(): void
             new ContactCollection([new Contact('bcc@myself.example')]),
             'Heya',
             'Hello there!',
-            $attachments
+            $attachments,
+            $headers
         );
 
         $this->assertEquals('123', $message->messageId);
@@ -42,6 +45,7 @@ public function it_should_return_values_it_was_instantiated_with(): void
         $this->assertEquals('Heya', $message->subject);
         $this->assertEquals('Hello there!', $message->body);
         $this->assertEquals($attachments, $message->attachments);
+        $this->assertEquals($headers, $message->headers);
     }
 
     /**
@@ -58,7 +62,8 @@ public function it_should_throw_exception_when_non_attachment_supplied_as_attach
             new ContactCollection([new Contact('bcc@myself.example')]),
             'Heya',
             'Hello there!',
-            [new stdClass()]
+            [new stdClass()],
+            new Headers([])
         );
     }
 }

tests/unit/Specification/Fixtures/MessageFactory.php

@@ -5,6 +5,7 @@
 
 use rpkamp\Mailhog\Message\Contact;
 use rpkamp\Mailhog\Message\ContactCollection;
+use rpkamp\Mailhog\Message\Headers;
 use rpkamp\Mailhog\Message\Message;
 use rpkamp\Mailhog\Message\Mime\Attachment;
 
@@ -22,7 +23,8 @@ public static function dummy(): Message
             'Hi there',
             [
                 new Attachment('lorem-ipsum.txt', 'text/plain', 'Lorem ipsum dolor sit amet!'),
-            ]
+            ],
+            new Headers([])
         );
     }
 }