Merge branch 'bugfix/github-actions' of https://github.com/mettle/sen…

…dportal-core into bugfix/github-actions

database/factories/TemplateFactory.php

@@ -12,7 +12,7 @@ class TemplateFactory extends Factory
 {
     /** @var string */
     protected $model = Template::class;
-    
+
     public function definition(): array
     {
         return [

database/migrations/2017_04_28_223029_create_campaign_statuses_table.php

@@ -20,10 +20,10 @@ public function up()
 
         DB::table('sendportal_campaign_statuses')
             ->insert([
-               ['name' => 'Draft'],
-               ['name' => 'Queued'],
-               ['name' => 'Sending'],
-               ['name' => 'Sent'],
+                ['name' => 'Draft'],
+                ['name' => 'Queued'],
+                ['name' => 'Sending'],
+                ['name' => 'Sent'],
             ]);
     }
 }

database/migrations/2020_10_16_092234_prefix_tables.php

@@ -17,7 +17,7 @@ public function up()
                 continue;
             }
 
-            if (!Schema::hasTable("{$table}")) {
+            if (! Schema::hasTable("{$table}")) {
                 continue;
             }
 

src/Adapters/PostalAdapter.php

@@ -6,41 +6,38 @@
 
 use DomainException;
 use Illuminate\Support\Arr;
-use Illuminate\Support\Str;
 use Postal\Client;
 use Postal\SendMessage;
 use Sendportal\Base\Services\Messages\MessageTrackingOptions;
-use Symfony\Component\HttpFoundation\Response;
 
 class PostalAdapter extends BaseMailAdapter
 {
-
     /**
      * @throws TypeException
      * @throws \Throwable
      */
     public function send(string $fromEmail, string $fromName, string $toEmail, string $subject, MessageTrackingOptions $trackingOptions, string $content): string
     {
         $client = new Client('https://' . Arr::get($this->config, 'postal_host'), Arr::get($this->config, 'key'));
-        
+
         $message = new SendMessage($client);
         $message->to($toEmail);
         $message->from($fromName.' <'.$fromEmail.'>');
         $message->subject($subject);
         $message->htmlBody($content);
         $response = $message->send();
-        
+
         return $this->resolveMessageId($response);
     }
 
- 
+
 
     protected function resolveMessageId($response): string
     {
         foreach ($response->recipients() as $email => $message) {
-            return (string) $message->id();    
+            return (string) $message->id();
         }
-        
+
         throw new DomainException('Unable to resolve message ID');
     }
 }

src/Adapters/SendgridMailAdapter.php

@@ -36,7 +36,7 @@ public function send(string $fromEmail, string $fromName, string $toEmail, strin
         $response = $this->resolveClient()->send($email);
 
         throw_if(
-            !in_array($response->statusCode(), [Response::HTTP_OK, Response::HTTP_ACCEPTED]),
+            ! in_array($response->statusCode(), [Response::HTTP_OK, Response::HTTP_ACCEPTED]),
             new DomainException($response->body(), $response->statusCode())
         );
 

src/Adapters/SmtpAdapter.php

@@ -53,7 +53,7 @@ protected function resolveTransport(): EsmtpTransport
 
         $encryption = Arr::get($this->config, 'encryption');
 
-        $scheme = !is_null($encryption) && $encryption === 'tls'
+        $scheme = ! is_null($encryption) && $encryption === 'tls'
             ? ((Arr::get($this->config, 'port') == 465) ? 'smtps' : 'smtp')
             : '';
 

src/Events/MessageDispatchEvent.php

@@ -10,7 +10,9 @@
 
 class MessageDispatchEvent
 {
-    use Dispatchable, InteractsWithSockets, SerializesModels;
+    use Dispatchable;
+    use InteractsWithSockets;
+    use SerializesModels;
 
     /**
      * @var Message

src/Events/SubscriberAddedEvent.php

@@ -11,7 +11,9 @@
 
 class SubscriberAddedEvent
 {
-    use Dispatchable, InteractsWithSockets, SerializesModels;
+    use Dispatchable;
+    use InteractsWithSockets;
+    use SerializesModels;
 
     /** @var Subscriber */
     public $subscriber;

src/Events/Webhooks/MailgunWebhookReceived.php

@@ -8,7 +8,9 @@
 
 class MailgunWebhookReceived
 {
-    use Dispatchable, InteractsWithSockets, SerializesModels;
+    use Dispatchable;
+    use InteractsWithSockets;
+    use SerializesModels;
 
     /** @var array */
     public $payload;

src/Facades/Helper.php

@@ -6,7 +6,6 @@
 
 class Helper extends Facade
 {
-
     /**
      * @return string
      */

src/Factories/MailAdapterFactory.php

@@ -7,11 +7,11 @@
 use InvalidArgumentException;
 use Sendportal\Base\Adapters\MailgunMailAdapter;
 use Sendportal\Base\Adapters\MailjetAdapter;
+use Sendportal\Base\Adapters\PostalAdapter;
 use Sendportal\Base\Adapters\PostmarkMailAdapter;
 use Sendportal\Base\Adapters\SendgridMailAdapter;
 use Sendportal\Base\Adapters\SesMailAdapter;
 use Sendportal\Base\Adapters\SmtpAdapter;
-use Sendportal\Base\Adapters\PostalAdapter;
 use Sendportal\Base\Interfaces\MailAdapterInterface;
 use Sendportal\Base\Models\EmailService;
 use Sendportal\Base\Models\EmailServiceType;
@@ -57,13 +57,13 @@ private function cache(MailAdapterInterface $adapter, EmailService $emailService
      */
     private function resolve(EmailService $emailService): MailAdapterInterface
     {
-        if (!$emailServiceType = EmailServiceType::resolve($emailService->type_id)) {
-            throw new InvalidArgumentException("Unable to resolve mail provider type from ID [$emailService->type_id].");
+        if (! $emailServiceType = EmailServiceType::resolve($emailService->type_id)) {
+            throw new InvalidArgumentException("Unable to resolve mail provider type from ID [{$emailService->type_id}].");
         }
 
         $adapterClass = self::$adapterMap[$emailService->type_id] ?? null;
 
-        if (!$adapterClass) {
+        if (! $adapterClass) {
             throw new InvalidArgumentException("Mail adapter type [{$emailServiceType}] is not supported.");
         }
 

src/Http/Controllers/Api/Webhooks/PostalWebhooksController.php

@@ -4,8 +4,6 @@
 
 namespace Sendportal\Base\Http\Controllers\Api\Webhooks;
 
-use Illuminate\Support\Arr;
-
 use Illuminate\Http\Response;
 use Illuminate\Support\Facades\Log;
 use Sendportal\Base\Events\Webhooks\PostalWebhookReceived;
@@ -20,7 +18,7 @@ public function handle(): Response
         Log::info('Postal webhook received');
 
         event(new PostalWebhookReceived($payload));
-        
+
 
         return response('OK');
     }

src/Http/Controllers/Api/Webhooks/SesWebhooksController.php

@@ -23,7 +23,7 @@ public function handle(): Response
 
         $payloadType = $payload['Type'] ?? null;
 
-        if (!in_array($payloadType, ['SubscriptionConfirmation', 'Notification'], true)) {
+        if (! in_array($payloadType, ['SubscriptionConfirmation', 'Notification'], true)) {
             return response('OK (not processed).');
         }
 

src/Http/Controllers/Auth/RegisterController.php

@@ -21,8 +21,8 @@
 
 class RegisterController extends Controller
 {
-    use RegistersUsers,
-        ChecksInvitations;
+    use RegistersUsers;
+    use ChecksInvitations;
 
     /** @var AcceptInvitation */
     private $acceptInvitation;

src/Http/Controllers/Campaigns/CampaignCancellationController.php

@@ -43,13 +43,13 @@ public function cancel(int $campaignId)
         $campaign = $this->campaignRepository->find(Sendportal::currentWorkspaceId(), $campaignId, ['status']);
         $originalStatus = $campaign->status;
 
-        if (!$campaign->canBeCancelled()) {
+        if (! $campaign->canBeCancelled()) {
             throw ValidationException::withMessages([
                 'campaignStatus' => "{$campaign->status->name} campaigns cannot be cancelled.",
             ])->redirectTo(route('sendportal.campaigns.index'));
         }
 
-        if ($campaign->save_as_draft && !$campaign->allDraftsCreated()) {
+        if ($campaign->save_as_draft && ! $campaign->allDraftsCreated()) {
             throw ValidationException::withMessages([
                 'messagesPendingDraft' => __('Campaigns that save draft messages cannot be cancelled until all drafts have been created.'),
             ])->redirectTo(route('sendportal.campaigns.index'));

src/Http/Controllers/Campaigns/CampaignDeleteController.php

@@ -32,7 +32,7 @@ public function confirm(int $id)
     {
         $campaign = $this->campaigns->find(Sendportal::currentWorkspaceId(), $id);
 
-        if (!$campaign->draft) {
+        if (! $campaign->draft) {
             return redirect()->route('sendportal.campaigns.index')
                 ->withErrors(__('Unable to delete a campaign that is not in draft status'));
         }
@@ -49,7 +49,7 @@ public function destroy(Request $request): RedirectResponse
     {
         $campaign = $this->campaigns->find(Sendportal::currentWorkspaceId(), $request->get('id'));
 
-        if (!$campaign->draft) {
+        if (! $campaign->draft) {
             return redirect()->route('sendportal.campaigns.index')
                 ->withErrors(__('Unable to delete a campaign that is not in draft status'));
         }

src/Http/Controllers/Campaigns/CampaignDispatchController.php

@@ -45,7 +45,7 @@ public function send(CampaignDispatchRequest $request, int $id): RedirectRespons
             return redirect()->route('sendportal.campaigns.status', $id);
         }
 
-        if (!$campaign->email_service_id) {
+        if (! $campaign->email_service_id) {
             return redirect()->route('sendportal.campaigns.edit', $id)
                 ->withErrors(__('Please select an Email Service'));
         }

src/Http/Controllers/Campaigns/CampaignTestController.php

@@ -28,7 +28,7 @@ public function handle(CampaignTestRequest $request, int $campaignId): RedirectR
     {
         $messageId = $this->dispatchTestMessage->handle(Sendportal::currentWorkspaceId(), $campaignId, $request->get('recipient_email'));
 
-        if (!$messageId) {
+        if (! $messageId) {
             return redirect()->route('sendportal.campaigns.preview', $campaignId)
                 ->withInput()
                 ->with(['error', __('Failed to dispatch test email.')]);

src/Http/Controllers/Campaigns/CampaignsController.php

@@ -164,7 +164,7 @@ public function preview(int $id)
         $campaign = $this->campaigns->find(Sendportal::currentWorkspaceId(), $id);
         $subscriberCount = $this->subscribers->countActive(Sendportal::currentWorkspaceId());
 
-        if (!$campaign->draft) {
+        if (! $campaign->draft) {
             return redirect()->route('sendportal.campaigns.status', $id);
         }
 
@@ -205,7 +205,7 @@ private function handleCheckboxes(array $input): array
         ];
 
         foreach ($checkboxFields as $checkboxField) {
-            if (!isset($input[$checkboxField])) {
+            if (! isset($input[$checkboxField])) {
                 $input[$checkboxField] = false;
             }
         }

src/Http/Controllers/Controller.php

@@ -9,5 +9,7 @@
 
 class Controller extends BaseController
 {
-    use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
+    use AuthorizesRequests;
+    use DispatchesJobs;
+    use ValidatesRequests;
 }

src/Http/Controllers/EmailServices/TestEmailServiceController.php

@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Sendportal\Base\Http\Controllers\EmailServices;
 
 use Exception;
@@ -45,7 +44,7 @@ public function store(int $emailServiceId, EmailServiceTestRequest $request, Dis
         try {
             $messageId = $dispatchTestMessage->testService(Sendportal::currentWorkspaceId(), $emailService, $options);
 
-            if (!$messageId) {
+            if (! $messageId) {
                 return redirect()
                     ->back()
                     ->with(['error', __('Failed to dispatch test email.')]);

src/Http/Controllers/MessagesController.php

@@ -101,7 +101,7 @@ public function show(int $messageId): View
      */
     public function send(): RedirectResponse
     {
-        if (!$message = $this->messageRepo->find(
+        if (! $message = $this->messageRepo->find(
             Sendportal::currentWorkspaceId(),
             request('id'),
             ['subscriber']
@@ -128,7 +128,7 @@ public function send(): RedirectResponse
      */
     public function delete(): RedirectResponse
     {
-        if (!$message = $this->messageRepo->find(
+        if (! $message = $this->messageRepo->find(
             Sendportal::currentWorkspaceId(),
             request('id')
         )) {
@@ -161,7 +161,7 @@ public function sendSelected(): RedirectResponse
             return redirect()->back()->withErrors(__('No messages selected'));
         }
 
-        if (!$messages = $this->messageRepo->getWhereIn(
+        if (! $messages = $this->messageRepo->getWhereIn(
             Sendportal::currentWorkspaceId(),
             request('messages'),
             ['subscriber']

src/Http/Controllers/Subscribers/SubscribersController.php

@@ -114,7 +114,7 @@ public function update(SubscriberRequest $request, int $id): RedirectResponse
         $data = $request->validated();
 
         // updating subscriber from subscribed -> unsubscribed
-        if (!$request->has('subscribed') && !$subscriber->unsubscribed_at) {
+        if (! $request->has('subscribed') && ! $subscriber->unsubscribed_at) {
             $data['unsubscribed_at'] = now();
             $data['unsubscribe_event_id'] = UnsubscribeEventType::MANUAL_BY_ADMIN;
         } // updating subscriber from unsubscribed -> subscribed
@@ -123,7 +123,7 @@ public function update(SubscriberRequest $request, int $id): RedirectResponse
             $data['unsubscribe_event_id'] = null;
         }
 
-        if (!$request->has('tags')) {
+        if (! $request->has('tags')) {
             $data['tags'] = [];
         }
 
@@ -156,7 +156,7 @@ public function export()
     {
         $subscribers = $this->subscriberRepo->all(Sendportal::currentWorkspaceId(), 'id');
 
-        if (!$subscribers->count()) {
+        if (! $subscribers->count()) {
             return redirect()->route('sendportal.subscribers.index')->withErrors(__('There are no subscribers to export'));
         }
 

src/Http/Controllers/Subscribers/SubscribersImportController.php

@@ -69,7 +69,7 @@ public function store(SubscribersImportRequest $request): RedirectResponse
                 'updated' => 0
             ];
 
-            (new FastExcel)->import(Storage::disk('local')->path($path), function (array $line) use ($request, &$counter) {
+            (new FastExcel())->import(Storage::disk('local')->path($path), function (array $line) use ($request, &$counter) {
                 $data = Arr::only($line, ['id', 'email', 'first_name', 'last_name']);
 
                 $data['tags'] = $request->get('tags') ?? [];
@@ -109,7 +109,7 @@ protected function validateCsvContents(string $path): ViewErrorBag
 
         $row = 1;
 
-        (new FastExcel)->import($path, function (array $line) use ($errors, &$row) {
+        (new FastExcel())->import($path, function (array $line) use ($errors, &$row) {
             $data = Arr::only($line, ['id', 'email', 'first_name', 'last_name']);
 
             try {

src/Http/Requests/EmailServiceRequest.php

@@ -28,7 +28,7 @@ public function rules()
             'name' => ['required']
         ];
 
-        if (!$this->route('id')) {
+        if (! $this->route('id')) {
             $rules['type_id'] = ['required', 'integer'];
         }
 

src/Http/Requests/EmailServiceTestRequest.php

@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Sendportal\Base\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;

src/Interfaces/BaseEloquentInterface.php

@@ -1,4 +1,6 @@
-<?php namespace Sendportal\Base\Interfaces;
+<?php
+
+namespace Sendportal\Base\Interfaces;
 
 interface BaseEloquentInterface
 {