| @@ -2,8 +2,8 @@ | ||
| 2 | 2 | |
| 3 | 3 | namespace Spatie\EmailCampaigns\Http\Controllers; | 
| 4 | 4 | |
| 5 | -use Spatie\EmailCampaigns\Support\WebBeacon; | |
| 6 | 5 | use Spatie\EmailCampaigns\Jobs\RegisterOpenJob; | 
| 6 | +use Spatie\EmailCampaigns\Support\WebBeacon; | |
| 7 | 7 | |
| 8 | 8 | class TrackOpensController | 
| 9 | 9 |  { | 
| @@ -17,6 +17,9 @@ | ||
| 17 | 17 | |
| 18 | 18 | protected $guarded = []; | 
| 19 | 19 | |
| 20 | + /** | |
| 21 | + * @return Subscriber | |
| 22 | + */ | |
| 20 | 23 | public static function findForEmail(string $email): ?Subscriber | 
| 21 | 24 |      { | 
| 22 | 25 |          return static::where('email', $email)->first(); | 
| @@ -3,12 +3,12 @@ | ||
| 3 | 3 | namespace Spatie\EmailCampaigns\Models; | 
| 4 | 4 | |
| 5 | 5 | use Illuminate\Database\Eloquent\Model; | 
| 6 | -use Spatie\EmailCampaigns\Support\Config; | |
| 6 | +use Illuminate\Database\Eloquent\Relations\HasManyThrough; | |
| 7 | 7 | use Spatie\EmailCampaigns\Actions\SubscribeAction; | 
| 8 | -use Spatie\EmailCampaigns\Models\Concerns\HasUuid; | |
| 9 | 8 | use Spatie\EmailCampaigns\Enums\SubscriptionStatus; | 
| 10 | -use Illuminate\Database\Eloquent\Relations\HasManyThrough; | |
| 11 | 9 | use Spatie\EmailCampaigns\Models\Concerns\HasExtraAttributes; | 
| 10 | +use Spatie\EmailCampaigns\Models\Concerns\HasUuid; | |
| 11 | +use Spatie\EmailCampaigns\Support\Config; | |
| 12 | 12 | |
| 13 | 13 | class Subscriber extends Model | 
| 14 | 14 |  { | 
| @@ -2,10 +2,10 @@ | ||
| 2 | 2 | |
| 3 | 3 | namespace Spatie\EmailCampaigns\Mails; | 
| 4 | 4 | |
| 5 | -use Illuminate\Mail\Mailable; | |
| 6 | 5 | use Illuminate\Contracts\Queue\ShouldQueue; | 
| 7 | -use Spatie\EmailCampaigns\Models\Subscription; | |
| 6 | +use Illuminate\Mail\Mailable; | |
| 8 | 7 | use Spatie\EmailCampaigns\Http\Controllers\ConfirmSubscriptionController; | 
| 8 | +use Spatie\EmailCampaigns\Models\Subscription; | |
| 9 | 9 | |
| 10 | 10 | class ConfirmSubscriptionMail extends Mailable implements ShouldQueue | 
| 11 | 11 |  { | 
| @@ -31,6 +31,9 @@ | ||
| 31 | 31 | $campaign->save(); | 
| 32 | 32 | } | 
| 33 | 33 | |
| 34 | + /** | |
| 35 | + * @param Campaign $campaign | |
| 36 | + */ | |
| 34 | 37 | protected function ensureEmailHtmlHasSingleRootElement($campaign) | 
| 35 | 38 |      { | 
| 36 | 39 |          if (! Str::startsWith(trim($campaign->email_html), '<html')) { | 
| @@ -2,13 +2,13 @@ | ||
| 2 | 2 | |
| 3 | 3 | namespace Spatie\EmailCampaigns\Actions; | 
| 4 | 4 | |
| 5 | -use DOMElement; | |
| 6 | 5 | use DOMDocument; | 
| 6 | +use DOMElement; | |
| 7 | 7 | use ErrorException; | 
| 8 | 8 | use Illuminate\Support\Str; | 
| 9 | -use Spatie\EmailCampaigns\Models\Campaign; | |
| 10 | 9 | use Spatie\EmailCampaigns\Exceptions\CouldNotSendCampaign; | 
| 11 | 10 | use Spatie\EmailCampaigns\Http\Controllers\TrackOpensController; | 
| 11 | +use Spatie\EmailCampaigns\Models\Campaign; | |
| 12 | 12 | |
| 13 | 13 | class PrepareEmailHtmlAction | 
| 14 | 14 |  { | 
| @@ -3,21 +3,21 @@ | ||
| 3 | 3 | namespace Spatie\EmailCampaigns\Models; | 
| 4 | 4 | |
| 5 | 5 | use Carbon\Carbon; | 
| 6 | -use Illuminate\Database\Eloquent\Model; | |
| 7 | 6 | use Illuminate\Database\Eloquent\Builder; | 
| 7 | +use Illuminate\Database\Eloquent\Model; | |
| 8 | +use Illuminate\Database\Eloquent\Relations\BelongsTo; | |
| 9 | +use Illuminate\Database\Eloquent\Relations\HasMany; | |
| 10 | +use Illuminate\Database\Eloquent\Relations\HasManyThrough; | |
| 8 | 11 | use Spatie\EmailCampaigns\Enums\CampaignStatus; | 
| 12 | +use Spatie\EmailCampaigns\Exceptions\CampaignCouldNotUpdate; | |
| 13 | +use Spatie\EmailCampaigns\Exceptions\CouldNotSendCampaign; | |
| 14 | +use Spatie\EmailCampaigns\Http\Controllers\CampaignWebviewController; | |
| 9 | 15 | use Spatie\EmailCampaigns\Jobs\SendCampaignJob; | 
| 10 | 16 | use Spatie\EmailCampaigns\Jobs\SendTestMailJob; | 
| 11 | 17 | use Spatie\EmailCampaigns\Mails\CampaignMailable; | 
| 12 | 18 | use Spatie\EmailCampaigns\Models\Concerns\HasUuid; | 
| 13 | -use Illuminate\Database\Eloquent\Relations\HasMany; | |
| 14 | -use Spatie\EmailCampaigns\Support\Segments\Segment; | |
| 15 | -use Illuminate\Database\Eloquent\Relations\BelongsTo; | |
| 16 | -use Illuminate\Database\Eloquent\Relations\HasManyThrough; | |
| 17 | -use Spatie\EmailCampaigns\Exceptions\CouldNotSendCampaign; | |
| 18 | 19 | use Spatie\EmailCampaigns\Support\Segments\EverySubscriber; | 
| 19 | -use Spatie\EmailCampaigns\Exceptions\CampaignCouldNotUpdate; | |
| 20 | -use Spatie\EmailCampaigns\Http\Controllers\CampaignWebviewController; | |
| 20 | +use Spatie\EmailCampaigns\Support\Segments\Segment; | |
| 21 | 21 | |
| 22 | 22 | class Campaign extends Model | 
| 23 | 23 |  { | 
| @@ -2,13 +2,13 @@ | ||
| 2 | 2 | |
| 3 | 3 | namespace Spatie\EmailCampaigns\Models; | 
| 4 | 4 | |
| 5 | -use Illuminate\Database\Eloquent\Model; | |
| 6 | 5 | use Illuminate\Database\Eloquent\Builder; | 
| 7 | -use Illuminate\Support\Facades\Validator; | |
| 6 | +use Illuminate\Database\Eloquent\Model; | |
| 7 | +use Illuminate\Database\Eloquent\Relations\BelongsToMany; | |
| 8 | 8 | use Illuminate\Database\Eloquent\Relations\HasMany; | 
| 9 | +use Illuminate\Support\Facades\Validator; | |
| 9 | 10 | use Spatie\EmailCampaigns\Enums\SubscriptionStatus; | 
| 10 | 11 | use Spatie\EmailCampaigns\Exceptions\CouldNotSubscribe; | 
| 11 | -use Illuminate\Database\Eloquent\Relations\BelongsToMany; | |
| 12 | 12 | |
| 13 | 13 | class EmailList extends Model | 
| 14 | 14 |  { |