Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
],
"require": {
"php": "^8.2",
"illuminate/contracts": ">=10.0 <14.0",
"illuminate/contracts": "^10.0 || ^11.0 || ^12.0",
"laravel/helpers": "^1.7.0",
"spatie/laravel-package-tools": "^1.15.0"
},
Expand All @@ -41,13 +41,13 @@
},
"autoload": {
"psr-4": {
"Backstage\\Mails\\": "src",
"Backstage\\Mails\\Database\\Factories\\": "database/factories"
"Backstage\\Mails\\Laravel\\": "src",
"Backstage\\Mails\\Laravel\\Database\\Factories\\": "database/factories"
}
},
"autoload-dev": {
"psr-4": {
"Backstage\\Mails\\Tests\\": "tests"
"Backstage\\Mails\\Laravel\\Tests\\": "tests"
},
"files": [
"helpers.php"
Expand All @@ -74,7 +74,7 @@
"extra": {
"laravel": {
"providers": [
"Backstage\\Mails\\MailsServiceProvider"
"Backstage\\Mails\\Laravel\\MailsServiceProvider"
]
}
},
Expand Down
6 changes: 3 additions & 3 deletions config/mails.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php

use Backstage\Mails\Models\Mail;
use Backstage\Mails\Models\MailAttachment;
use Backstage\Mails\Models\MailEvent;
use Backstage\Mails\Laravel\Models\Mail;
use Backstage\Mails\Laravel\Models\MailAttachment;
use Backstage\Mails\Laravel\Models\MailEvent;

return [

Expand Down
4 changes: 2 additions & 2 deletions database/factories/MailAttachmentFactory.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php

namespace Backstage\Mails\Database\Factories;
namespace Backstage\Mails\Laravel\Database\Factories;

use Backstage\Mails\Models\MailAttachment;
use Backstage\Mails\Laravel\Models\MailAttachment;
use Illuminate\Database\Eloquent\Factories\Factory;

class MailAttachmentFactory extends Factory
Expand Down
4 changes: 2 additions & 2 deletions database/factories/MailEventFactory.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php

namespace Backstage\Mails\Database\Factories;
namespace Backstage\Mails\Laravel\Database\Factories;

use Backstage\Mails\Models\MailEvent;
use Backstage\Mails\Laravel\Models\MailEvent;
use Illuminate\Database\Eloquent\Factories\Factory;

class MailEventFactory extends Factory
Expand Down
4 changes: 2 additions & 2 deletions database/factories/MailFactory.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php

namespace Backstage\Mails\Database\Factories;
namespace Backstage\Mails\Laravel\Database\Factories;

use Backstage\Mails\Models\Mail;
use Backstage\Mails\Laravel\Models\Mail;
use Illuminate\Database\Eloquent\Factories\Factory;

class MailFactory extends Factory
Expand Down
4 changes: 2 additions & 2 deletions helpers.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php

namespace Backstage\Mails;
namespace Backstage\Mails\Laravel;

use Backstage\Mails\Shared\Terminal;
use Backstage\Mails\Laravel\Shared\Terminal;

if (! function_exists('console')) {
function console(): Terminal
Expand Down
2 changes: 1 addition & 1 deletion routes/webhooks.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

use Backstage\Mails\Controllers\WebhookController;
use Backstage\Mails\Laravel\Controllers\WebhookController;
use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken;
use Illuminate\Support\Facades\Route;

Expand Down
16 changes: 6 additions & 10 deletions src/Actions/AttachUuid.php
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?php

namespace Backstage\Mails\Actions;
namespace Backstage\Mails\Laravel\Actions;

use Backstage\Mails\Facades\MailProvider;
use Backstage\Mails\Shared\AsAction;
use Backstage\Mails\Laravel\Facades\MailProvider;
use Backstage\Mails\Laravel\Shared\AsAction;
use Illuminate\Mail\Events\MessageSending;
use Illuminate\Support\Str;

Expand All @@ -13,20 +13,16 @@ class AttachUuid

public function handle(MessageSending $messageSending): MessageSending
{
if (! config('mails.logging.enabled')) {
$provider = $this->getProvider($messageSending);

if (! $this->shouldTrackMails($provider)) {
return $messageSending;
}

$uuid = Str::uuid()->toString();

$messageSending->message->getHeaders()->addTextHeader(config('mails.headers.uuid'), $uuid);

$provider = $this->getProvider($messageSending);

if (! $this->shouldTrackMails($provider)) {
return $messageSending;
}

return MailProvider::with($provider)->attachUuidToMail($messageSending, $uuid);
}

Expand Down
10 changes: 5 additions & 5 deletions src/Actions/LogMail.php
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?php

namespace Backstage\Mails\Actions;
namespace Backstage\Mails\Laravel\Actions;

use Backstage\Mails\Enums\Provider;
use Backstage\Mails\Models\Mail;
use Backstage\Mails\Shared\AsAction;
use Backstage\Mails\Laravel\Enums\Provider;
use Backstage\Mails\Laravel\Models\Mail;
use Backstage\Mails\Laravel\Shared\AsAction;
use Illuminate\Mail\Events\MessageSending;
use Illuminate\Mail\Events\MessageSent;
use Illuminate\Support\Collection;
Expand Down Expand Up @@ -98,7 +98,7 @@ public function getMandatoryAttributes(MessageSending|MessageSent $event): array
{
return [
'uuid' => $this->getCustomUuid($event),
'mail_class' => $event->data['__laravel_mailable'] ?? null,
// 'mail_class' => $this->getMailClassHeaderValue($event),
'sent_at' => $event instanceof MessageSent ? now() : null,
'mailer' => $event->data['mailer'],
'stream_id' => $this->getStreamId($event),
Expand Down
6 changes: 3 additions & 3 deletions src/Actions/RegisterWebhooks.php
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?php

namespace Backstage\Mails\Actions;
namespace Backstage\Mails\Laravel\Actions;

use Backstage\Mails\Facades\MailProvider;
use Backstage\Mails\Shared\AsAction;
use Backstage\Mails\Laravel\Facades\MailProvider;
use Backstage\Mails\Laravel\Shared\AsAction;
use Illuminate\Console\Concerns\InteractsWithIO;
use Illuminate\Console\View\Components\Factory;

Expand Down
2 changes: 1 addition & 1 deletion src/Actions/RelateMailToModels.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Backstage\Mails\Actions;
namespace Backstage\Mails\Laravel\Actions;

class RelateMailToModels
{
Expand Down
8 changes: 4 additions & 4 deletions src/Actions/ResendMail.php
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?php

namespace Backstage\Mails\Actions;
namespace Backstage\Mails\Laravel\Actions;

use Backstage\Mails\Jobs\ResendMailJob;
use Backstage\Mails\Models\Mail as Mailable;
use Backstage\Mails\Shared\AsAction;
use Backstage\Mails\Laravel\Jobs\ResendMailJob;
use Backstage\Mails\Laravel\Models\Mail as Mailable;
use Backstage\Mails\Laravel\Shared\AsAction;

class ResendMail
{
Expand Down
8 changes: 4 additions & 4 deletions src/Actions/SendHighBounceRateNotifications.php
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?php

namespace Backstage\Mails\Actions;
namespace Backstage\Mails\Laravel\Actions;

use Backstage\Mails\Notifications\HighBounceRateNotification;
use Backstage\Mails\Shared\AsAction;
use Backstage\Mails\Traits\SendsNotifications;
use Backstage\Mails\Laravel\Notifications\HighBounceRateNotification;
use Backstage\Mails\Laravel\Shared\AsAction;
use Backstage\Mails\Laravel\Traits\SendsNotifications;

class SendHighBounceRateNotifications
{
Expand Down
4 changes: 2 additions & 2 deletions src/Commands/CheckBounceRateCommand.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php

namespace Backstage\Mails\Commands;
namespace Backstage\Mails\Laravel\Commands;

use Backstage\Mails\Actions\SendHighBounceRateNotifications;
use Backstage\Mails\Laravel\Actions\SendHighBounceRateNotifications;
use Illuminate\Console\Command;
use Illuminate\Database\Eloquent\Model;

Expand Down
4 changes: 2 additions & 2 deletions src/Commands/MonitorMailCommand.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php

namespace Backstage\Mails\Commands;
namespace Backstage\Mails\Laravel\Commands;

use Backstage\Mails\Models\Mail;
use Backstage\Mails\Laravel\Models\Mail;
use Illuminate\Console\Command;

class MonitorMailCommand extends Command
Expand Down
4 changes: 2 additions & 2 deletions src/Commands/PruneMailCommand.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php

namespace Backstage\Mails\Commands;
namespace Backstage\Mails\Laravel\Commands;

use Backstage\Mails\Models\Mail;
use Backstage\Mails\Laravel\Models\Mail;
use Illuminate\Console\Command;

class PruneMailCommand extends Command
Expand Down
6 changes: 3 additions & 3 deletions src/Commands/ResendMailCommand.php
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?php

namespace Backstage\Mails\Commands;
namespace Backstage\Mails\Laravel\Commands;

use Backstage\Mails\Jobs\ResendMailJob;
use Backstage\Mails\Models\Mail;
use Backstage\Mails\Laravel\Jobs\ResendMailJob;
use Backstage\Mails\Laravel\Models\Mail;
use Illuminate\Console\Command;
use Illuminate\Contracts\Console\PromptsForMissingInput;

Expand Down
4 changes: 2 additions & 2 deletions src/Commands/WebhooksMailCommand.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php

namespace Backstage\Mails\Commands;
namespace Backstage\Mails\Laravel\Commands;

use Backstage\Mails\Actions\RegisterWebhooks;
use Backstage\Mails\Laravel\Actions\RegisterWebhooks;
use Illuminate\Console\Command;
use Illuminate\Contracts\Console\PromptsForMissingInput;

Expand Down
2 changes: 1 addition & 1 deletion src/Contracts/HasAssociatedMails.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Backstage\Mails\Contracts;
namespace Backstage\Mails\Laravel\Contracts;

use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\HasManyThrough;
Expand Down
4 changes: 2 additions & 2 deletions src/Contracts/MailDriverContract.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php

namespace Backstage\Mails\Contracts;
namespace Backstage\Mails\Laravel\Contracts;

use Backstage\Mails\Models\Mail;
use Backstage\Mails\Laravel\Models\Mail;
use Illuminate\Http\Client\Response;
use Illuminate\Mail\Events\MessageSending;

Expand Down
2 changes: 1 addition & 1 deletion src/Contracts/MailProviderContract.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Backstage\Mails\Contracts;
namespace Backstage\Mails\Laravel\Contracts;

interface MailProviderContract
{
Expand Down
4 changes: 2 additions & 2 deletions src/Controllers/WebhookController.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php

namespace Backstage\Mails\Controllers;
namespace Backstage\Mails\Laravel\Controllers;

use Backstage\Mails\Jobs\ProcessWebhookJob;
use Backstage\Mails\Laravel\Jobs\ProcessWebhookJob;
use Illuminate\Http\Request;
use Illuminate\Http\Response;

Expand Down
6 changes: 3 additions & 3 deletions src/Drivers/MailDriver.php
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?php

namespace Backstage\Mails\Drivers;
namespace Backstage\Mails\Laravel\Drivers;

use Backstage\Mails\Exceptions\LaravelMailException;
use Backstage\Mails\Models\Mail;
use Backstage\Mails\Laravel\Exceptions\LaravelMailException;
use Backstage\Mails\Laravel\Models\Mail;
use Illuminate\Support\Str;

abstract class MailDriver
Expand Down
8 changes: 4 additions & 4 deletions src/Drivers/MailgunDriver.php
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?php

namespace Backstage\Mails\Drivers;
namespace Backstage\Mails\Laravel\Drivers;

use Backstage\Mails\Contracts\MailDriverContract;
use Backstage\Mails\Enums\EventType;
use Backstage\Mails\Enums\Provider;
use Backstage\Mails\Laravel\Contracts\MailDriverContract;
use Backstage\Mails\Laravel\Enums\EventType;
use Backstage\Mails\Laravel\Enums\Provider;
use Illuminate\Http\Client\Response;
use Illuminate\Mail\Events\MessageSending;
use Illuminate\Support\Facades\Http;
Expand Down
10 changes: 5 additions & 5 deletions src/Drivers/PostmarkDriver.php
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?php

namespace Backstage\Mails\Drivers;
namespace Backstage\Mails\Laravel\Drivers;

use Backstage\Mails\Contracts\MailDriverContract;
use Backstage\Mails\Enums\EventType;
use Backstage\Mails\Enums\Provider;
use Backstage\Mails\Models\Mail;
use Backstage\Mails\Laravel\Contracts\MailDriverContract;
use Backstage\Mails\Laravel\Enums\EventType;
use Backstage\Mails\Laravel\Enums\Provider;
use Backstage\Mails\Laravel\Models\Mail;
use Illuminate\Http\Client\Response;
use Illuminate\Mail\Events\MessageSending;
use Illuminate\Support\Facades\Http;
Expand Down
Loading