Add support for Laravel 5.5.

Author: Mark van den Broek

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## [Unreleased]
 
+### Updated
+- Added support for Laravel 5.5.
+
 ## [2.0.0]
 
 ### Added

README.md

@@ -19,13 +19,7 @@ $ composer require coconutcraig/laravel-postmark
 
 ## Usage
 
-After updating composer, add the PostmarkServiceProvider to the providers array in `config/app.php`
-
-``` php
-Coconuts\Mail\PostmarkServiceProvider::class,
-```
-
-Next we will need to update the `config/services.php` file to hold our Postmark specific config.
+Update the `config/services.php` file to hold our Postmark specific config.
 
 ```php
 return [

composer.json

@@ -17,15 +17,15 @@
         }
     ],
     "require": {
-        "php": "~7.0",
+        "php": ">=7.0",
         "guzzlehttp/guzzle": "~6.0",
-        "illuminate/mail": "~5.4",
-        "illuminate/support": "~5.4"
+        "illuminate/mail": "~5.5",
+        "illuminate/support": "~5.5"
     },
     "require-dev": {
-        "orchestra/testbench": "~3.4",
-        "phpunit/phpunit": "~5.0",
-        "squizlabs/php_codesniffer": "^2.3"
+        "orchestra/testbench": "~3.5",
+        "phpunit/phpunit": "^6.2",
+        "squizlabs/php_codesniffer": "^3.0"
     },
     "autoload": {
         "psr-4": {
@@ -45,9 +45,16 @@
     "extra": {
         "branch-alias": {
             "dev-master": "2.0-dev"
+        },
+        "laravel": {
+            "providers": [
+                "Coconuts\\Mail\\PostmarkServiceProvider"
+            ]
         }
     },
     "config": {
         "sort-packages": true
-    }
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true
 }

src/PostmarkTransport.php

@@ -3,7 +3,7 @@
 namespace Coconuts\Mail;
 
 use Swift_Attachment;
-use Swift_Mime_Message;
+use Swift_Mime_SimpleMessage;
 use GuzzleHttp\ClientInterface;
 use Illuminate\Mail\Transport\Transport;
 
@@ -50,12 +50,12 @@ public function __construct(ClientInterface $client, $key)
      * Recipient/sender data will be retrieved from the Message API.
      * The return value is the number of recipients who were accepted for delivery.
      *
-     * @param Swift_Mime_Message $message
+     * @param Swift_Mime_SimpleMessage $message
      * @param string[] $failedRecipients An array of failures by-reference
      *
      * @return int
      */
-    public function send(Swift_Mime_Message $message, &$failedRecipients = null)
+    public function send(Swift_Mime_SimpleMessage $message, &$failedRecipients = null)
     {
         $this->beforeSendPerformed($message);
 
@@ -74,11 +74,11 @@ public function send(Swift_Mime_Message $message, &$failedRecipients = null)
     /**
      * Get all attachments for the given message.
      *
-     * @param \Swift_Mime_Message $message
+     * @param \Swift_Mime_SimpleMessage $message
      *
      * @return array
      */
-    protected function getAttachments(Swift_Mime_Message $message)
+    protected function getAttachments(Swift_Mime_SimpleMessage $message)
     {
         $attachments = [];
 
@@ -123,7 +123,7 @@ protected function getContacts($contacts)
      *
      * @return string
      */
-    protected function getFrom(Swift_Mime_Message $message)
+    protected function getFrom(Swift_Mime_SimpleMessage $message)
     {
         return collect($message->getFrom())
             ->map(function ($display, $address) {
@@ -155,7 +155,7 @@ protected function getMessageId($response)
      *
      * @return array
      */
-    protected function payload(Swift_Mime_Message $message)
+    protected function payload(Swift_Mime_SimpleMessage $message)
     {
         $headers = $message->getHeaders();
 

tests/PostmarkTransportTest.php

@@ -26,7 +26,7 @@ public function setUp()
     {
         parent::setUp();
 
-        $attachment = \Swift_Attachment::newInstance('test attachment', 'test.txt');
+        $attachment = new \Swift_Attachment('test attachment', 'test.txt');
         $attachment->setContentType('text/plain');
         $message = new \Swift_Message('Foo subject', 'Bar body');
         $message->setFrom('[email protected]');