From 307ecb00ca2946e174ccf46f403d51d1feb03be7 Mon Sep 17 00:00:00 2001 From: "Cyril \"Kyriog\" Glapa" Date: Tue, 11 Dec 2018 17:33:49 +0100 Subject: [PATCH 1/4] Implementing Transport::getMessage() to comply with API 100.2.0 --- Model/Transport.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Model/Transport.php b/Model/Transport.php index aba33c0..7ecdf3d 100644 --- a/Model/Transport.php +++ b/Model/Transport.php @@ -65,4 +65,12 @@ public function sendMessage() throw new \Magento\Framework\Exception\MailException(new \Magento\Framework\Phrase($e->getMessage()), $e); } } + + /** + * @inheritdoc + */ + public function getMessage() + { + return $this->_message; + } } \ No newline at end of file From 2eb5b0d712a244c27704522a663775a6da76743b Mon Sep 17 00:00:00 2001 From: "Cyril \"Kyriog\" Glapa" Date: Tue, 11 Dec 2018 17:34:16 +0100 Subject: [PATCH 2/4] Updating DI preference to match Magento best practices --- etc/di.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/di.xml b/etc/di.xml index 4deb112..be84524 100644 --- a/etc/di.xml +++ b/etc/di.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file From f789e32dcf1c649368ceeec4a26dab7fd2fc6a5a Mon Sep 17 00:00:00 2001 From: "Cyril \"Kyriog\" Glapa" Date: Tue, 11 Dec 2018 17:34:29 +0100 Subject: [PATCH 3/4] Adding dependency to Magento_Email to ensure correct load order --- composer.json | 4 +++- etc/module.xml | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 1da3173..b6dfb8c 100644 --- a/composer.json +++ b/composer.json @@ -9,7 +9,9 @@ } ], "minimum-stability": "dev", - "require": {}, + "require": { + "magento/module-email": "*" + }, "autoload": { "files": [ "registration.php" diff --git a/etc/module.xml b/etc/module.xml index 486be28..5d24fd8 100644 --- a/etc/module.xml +++ b/etc/module.xml @@ -1,4 +1,8 @@ - + + + + + From acb88fbd503d42f67eab4a1c51bef8f10ab96da7 Mon Sep 17 00:00:00 2001 From: "Cyril \"Kyriog\" Glapa" Date: Tue, 11 Dec 2018 17:34:45 +0100 Subject: [PATCH 4/4] Bumping to version 1.1.0 --- composer.json | 1 + etc/module.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index b6dfb8c..35de976 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,7 @@ { "name": "codepeak/magento2-mailtrap", "description": "Enable mail testing through Mailtrap.io", + "version": "1.1.0", "license": "proprietary", "authors": [ { diff --git a/etc/module.xml b/etc/module.xml index 5d24fd8..cfc84e2 100644 --- a/etc/module.xml +++ b/etc/module.xml @@ -1,6 +1,6 @@ - +