diff --git a/CHANGELOG.md b/CHANGELOG.md index 2f58d5d..1ae5566 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Craft CMS - Mailjet mailer adapter +## v2.1.0 - 2024-05-20 + +### Changed + +- Updated for Craft CMS 5 + ## v2.0.2 - 2024-03-24 ### Changed diff --git a/composer.json b/composer.json index 3f0f455..12d4d76 100644 --- a/composer.json +++ b/composer.json @@ -11,13 +11,13 @@ "mailer", "adapter" ], - "homepage": "https://github.com/bertoost/Craft-3-Mailjet", + "homepage": "https://github.com/bertoost/Craft-Mailjet", "license": "MIT", "require": { - "php": "^8.0", - "craftcms/cms": "^4.1", - "mailjet/mailjet-apiv3-php": "^1.5.6", - "symfony/mailjet-mailer": "^v6.0" + "php": "^8.2", + "craftcms/cms": "^5.0", + "mailjet/mailjet-apiv3-php": "^1.6", + "symfony/mailjet-mailer": "^v7.0" }, "autoload": { "psr-4": { @@ -30,6 +30,6 @@ "hasCpSettings": true, "developer": "Bert Oost", "developerUrl": "https://bertoost.com", - "documentationUrl": "https://github.com/bertoost/Craft-3-Mailjet/blob/master/README.md" + "documentationUrl": "https://github.com/bertoost/Craft-Mailjet/blob/master/README.md" } } diff --git a/src/adapters/MailjetAdapter.php b/src/adapters/MailjetAdapter.php index c29442d..39eab9f 100644 --- a/src/adapters/MailjetAdapter.php +++ b/src/adapters/MailjetAdapter.php @@ -67,13 +67,10 @@ public function defineTransport(): array|AbstractTransport ); } - /** - * Returns whether or not the system is using this adapter - */ public static function isUsed(): bool { - $mailTransport = Craft::$app->getMailer()->getTransport(); + $transportType = Craft::$app->getProjectConfig()->get('email.transportType'); - return $mailTransport instanceof MailjetApiTransport; + return $transportType === self::class; } } \ No newline at end of file diff --git a/src/traits/PluginEventsTrait.php b/src/traits/PluginEventsTrait.php index 8f57f10..fe0d083 100644 --- a/src/traits/PluginEventsTrait.php +++ b/src/traits/PluginEventsTrait.php @@ -23,7 +23,7 @@ public function registerEvents(): void // register adapter Event::on( MailerHelper::class, - MailerHelper::EVENT_REGISTER_MAILER_TRANSPORT_TYPES, + MailerHelper::EVENT_REGISTER_MAILER_TRANSPORTS, static function (RegisterComponentTypesEvent $event) { $event->types[] = MailjetAdapter::class; } @@ -35,7 +35,7 @@ static function (RegisterComponentTypesEvent $event) { // register utility Event::on( Utilities::class, - Utilities::EVENT_REGISTER_UTILITY_TYPES, + Utilities::EVENT_REGISTER_UTILITIES, static function (RegisterComponentTypesEvent $event) { $event->types[] = MailjetEventsUtility::class; }