Merge branch 'master' of github.com:beyondcode/laravel-mailbox

Author: mpociot

config/mailbox.php

@@ -44,7 +44,7 @@
      */
     'basic_auth' => [
         'username' => env('MAILBOX_HTTP_USERNAME', 'laravel-mailbox'),
-        'password' => env('MAILBOX_HTTP_PASSWORD')
+        'password' => env('MAILBOX_HTTP_PASSWORD'),
     ],
 
     /*
@@ -56,6 +56,6 @@
             'key' => env('MAILBOX_MAILGUN_KEY'),
         ],
 
-    ]
+    ],
 
-];
+];

src/Concerns/HandlesParameters.php

@@ -37,4 +37,4 @@ protected function matchToKeys(array $matches)
             return is_string($value) && strlen($value) > 0;
         });
     }
-}
+}

src/Concerns/HandlesRegularExpressions.php

@@ -46,4 +46,4 @@ protected function parseWhere($name, $expression)
     {
         return is_array($name) ? $name : [$name => $expression];
     }
-}
+}

src/Console/CleanEmails.php

@@ -26,4 +26,4 @@ public function handle()
 
         $this->comment('All done!');
     }
-}
+}

src/Drivers/DriverInterface.php

@@ -5,4 +5,4 @@
 interface DriverInterface
 {
     public function register();
-}
+}

src/Drivers/Log.php

@@ -8,7 +8,6 @@
 
 class Log implements DriverInterface
 {
-
     public function register()
     {
         app('events')->listen(MessageLogged::class, [$this, 'processLog']);
@@ -20,4 +19,4 @@ public function processLog(MessageLogged $log)
 
         Mailbox::callMailboxes($email);
     }
-}
+}

src/Drivers/Mailgun.php

@@ -7,11 +7,10 @@
 
 class Mailgun implements DriverInterface
 {
-
     public function register()
     {
         Route::prefix(config('mailbox.path'))->group(function () {
             Route::post('/mailgun/mime', MailgunController::class);
         });
     }
-}
+}

src/Drivers/SendGrid.php

@@ -2,16 +2,15 @@
 
 namespace BeyondCode\Mailbox\Drivers;
 
-use BeyondCode\Mailbox\Http\Controllers\SendGridController;
 use Illuminate\Support\Facades\Route;
+use BeyondCode\Mailbox\Http\Controllers\SendGridController;
 
 class SendGrid implements DriverInterface
 {
-
     public function register()
     {
         Route::prefix(config('mailbox.path'))->group(function () {
             Route::post('/sendgrid', SendGridController::class);
         });
     }
-}
+}

src/Facades/Mailbox.php

@@ -10,4 +10,4 @@ protected static function getFacadeAccessor()
     {
         return 'mailbox';
     }
-}
+}

src/Http/Controllers/MailgunController.php

@@ -11,4 +11,4 @@ public function __invoke(MailgunRequest $request)
     {
         Mailbox::callMailboxes($request->email());
     }
-}
+}

src/Http/Controllers/SendGridController.php

@@ -17,4 +17,4 @@ public function __invoke(SendGridRequest $request)
     {
         Mailbox::callMailboxes($request->email());
     }
-}
+}

src/Http/Middleware/MailboxBasicAuthentication.php

@@ -18,4 +18,4 @@ public function handle($request, Closure $next)
 
         throw new UnauthorizedHttpException('Laravel Mailbox');
     }
-}
+}

src/Http/Requests/MailgunRequest.php

@@ -2,10 +2,10 @@
 
 namespace BeyondCode\Mailbox\Http\Requests;
 
-use BeyondCode\Mailbox\InboundEmail;
 use Carbon\Carbon;
-use Illuminate\Foundation\Http\FormRequest;
+use BeyondCode\Mailbox\InboundEmail;
 use Illuminate\Support\Facades\Validator;
+use Illuminate\Foundation\Http\FormRequest;
 
 class MailgunRequest extends FormRequest
 {
@@ -15,7 +15,7 @@ public function validator()
             'body-mime' => 'required',
             'timestamp' => 'required',
             'token' => 'required',
-            'signature' => 'required'
+            'signature' => 'required',
         ]);
 
         $validator->after(function () {
@@ -45,4 +45,4 @@ protected function isFresh($timestamp): bool
     {
         return now()->subMinutes(2)->lte(Carbon::createFromTimestamp($timestamp));
     }
-}
+}

src/Http/Requests/SendGridRequest.php

@@ -3,8 +3,8 @@
 namespace BeyondCode\Mailbox\Http\Requests;
 
 use BeyondCode\Mailbox\InboundEmail;
-use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Facades\Validator;
+use Illuminate\Foundation\Http\FormRequest;
 
 class SendGridRequest extends FormRequest
 {
@@ -19,4 +19,4 @@ public function email()
     {
         return InboundEmail::fromMessage($this->get('email'));
     }
-}
+}

src/InboundEmail.php

@@ -3,12 +3,12 @@
 namespace BeyondCode\Mailbox;
 
 use Carbon\Carbon;
-use Illuminate\Contracts\Mail\Mailable;
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Mail;
-use ZBateson\MailMimeParser\Message as MimeMessage;
+use Illuminate\Contracts\Mail\Mailable;
+use Illuminate\Database\Eloquent\Model;
 use ZBateson\MailMimeParser\Header\AddressHeader;
+use ZBateson\MailMimeParser\Message as MimeMessage;
 use ZBateson\MailMimeParser\Header\Part\AddressPart;
 use ZBateson\MailMimeParser\Message\Part\MessagePart;
 
@@ -20,7 +20,7 @@ class InboundEmail extends Model
     protected $mimeMessage;
 
     protected $fillable = [
-        'message'
+        'message',
     ];
 
     protected static function boot()
@@ -159,4 +159,4 @@ public function isValid(): bool
     {
         return $this->from() !== '' && ($this->text() !== '' || $this->html() !== '');
     }
-}
+}

src/MailboxManager.php

@@ -2,14 +2,13 @@
 
 namespace BeyondCode\Mailbox;
 
-use BeyondCode\Mailbox\Drivers\SendGrid;
 use Illuminate\Support\Manager;
 use BeyondCode\Mailbox\Drivers\Log;
 use BeyondCode\Mailbox\Drivers\Mailgun;
+use BeyondCode\Mailbox\Drivers\SendGrid;
 
 class MailboxManager extends Manager
 {
-
     public function mailbox($name = null)
     {
         return $this->driver($name);
@@ -34,4 +33,4 @@ public function getDefaultDriver()
     {
         return $this->app['config']['mailbox.driver'];
     }
-}
+}

src/MailboxServiceProvider.php

@@ -2,10 +2,10 @@
 
 namespace BeyondCode\Mailbox;
 
-use BeyondCode\Mailbox\Http\Middleware\MailboxBasicAuthentication;
-use BeyondCode\Mailbox\Routing\Router;
 use Illuminate\Support\Facades\Route;
+use BeyondCode\Mailbox\Routing\Router;
 use Illuminate\Support\ServiceProvider;
+use BeyondCode\Mailbox\Http\Middleware\MailboxBasicAuthentication;
 
 class MailboxServiceProvider extends ServiceProvider
 {
@@ -21,13 +21,13 @@ public function boot()
         }
 
         $this->publishes([
-            __DIR__.'/../config/mailbox.php' => config_path('mailbox.php')
+            __DIR__.'/../config/mailbox.php' => config_path('mailbox.php'),
         ], 'config');
 
         Route::aliasMiddleware('laravel-mailbox', MailboxBasicAuthentication::class);
 
         $this->commands([
-            Console\CleanEmails::class
+            Console\CleanEmails::class,
         ]);
 
         $this->registerDriver();

src/Routing/Route.php

@@ -2,15 +2,15 @@
 
 namespace BeyondCode\Mailbox\Routing;
 
-use BeyondCode\Mailbox\Concerns\HandlesParameters;
-use BeyondCode\Mailbox\Concerns\HandlesRegularExpressions;
-use BeyondCode\Mailbox\InboundEmail;
+use ReflectionFunction;
+use Illuminate\Support\Str;
+use Illuminate\Support\Collection;
 use Illuminate\Container\Container;
+use BeyondCode\Mailbox\InboundEmail;
+use BeyondCode\Mailbox\Concerns\HandlesParameters;
 use Illuminate\Routing\RouteDependencyResolverTrait;
-use Illuminate\Support\Collection;
-use Illuminate\Support\Str;
-use ReflectionFunction;
 use ZBateson\MailMimeParser\Header\Part\AddressPart;
+use BeyondCode\Mailbox\Concerns\HandlesRegularExpressions;
 
 class Route
 {
@@ -173,5 +173,4 @@ protected function parseMailboxCallback()
     {
         return Str::parseCallback($this->action);
     }
-
-}
+}

src/Routing/RouteCollection.php

@@ -2,8 +2,8 @@
 
 namespace BeyondCode\Mailbox\Routing;
 
-use BeyondCode\Mailbox\InboundEmail;
 use Illuminate\Support\Collection;
+use BeyondCode\Mailbox\InboundEmail;
 
 class RouteCollection
 {
@@ -20,4 +20,4 @@ public function match(InboundEmail $message): Collection
             return $route->matches($message);
         });
     }
-}
+}

src/Routing/Router.php

@@ -2,9 +2,9 @@
 
 namespace BeyondCode\Mailbox\Routing;
 
-use BeyondCode\Mailbox\InboundEmail;
-use Illuminate\Container\Container;
 use Illuminate\Support\Collection;
+use Illuminate\Container\Container;
+use BeyondCode\Mailbox\InboundEmail;
 
 class Router
 {
@@ -71,7 +71,6 @@ protected function createRoute(string $subject, string $pattern, $action)
     public function callMailboxes(InboundEmail $email)
     {
         if ($email->isValid()) {
-
             $matchedRoutes = $this->routes->match($email)->map(function (Route $route) use ($email) {
                 $route->run($email);
             });
@@ -116,5 +115,4 @@ protected function storeEmail(InboundEmail $email)
     {
         $email->save();
     }
-
-}
+}

tests/Console/CleanEmailsTest.php

@@ -3,11 +3,11 @@
 namespace BeyondCode\Mailbox\Tests\Console;
 
 use Artisan;
-use BeyondCode\Mailbox\InboundEmail;
-use BeyondCode\Mailbox\Tests\TestCase;
 use Carbon\Carbon;
-use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
+use Illuminate\Support\Collection;
+use BeyondCode\Mailbox\InboundEmail;
+use BeyondCode\Mailbox\Tests\TestCase;
 
 class CleanEmailsTest extends TestCase
 {
@@ -40,4 +40,4 @@ public function it_can_clean_the_statistics()
 
         $this->assertCount(0, InboundEmail::where('created_at', '<', $cutOffDate)->get());
     }
-}
+}

tests/Controllers/MailgunTest.php

@@ -20,21 +20,21 @@ public function it_verifies_mailgun_signatures()
             'body-mime' => 'mime',
             'timestamp' => 1548104992,
             'token' => 'something',
-            'signature' => 'something'
+            'signature' => 'something',
         ])->assertStatus(401);
 
         $timestamp = time();
         $token = uniqid();
 
         $this->app['config']['mailbox.services.mailgun.key'] = '12345';
 
-        $validSignature = hash_hmac('sha256', $timestamp . $token, '12345');
+        $validSignature = hash_hmac('sha256', $timestamp.$token, '12345');
 
         $this->post('/laravel-mailbox/mailgun/mime', [
             'body-mime' => 'mime',
             'timestamp' => $timestamp,
             'token' => $token,
-            'signature' => $validSignature
+            'signature' => $validSignature,
         ])->assertStatus(200);
     }
 
@@ -46,14 +46,13 @@ public function it_verifies_fresh_timestamps()
 
         $this->app['config']['mailbox.services.mailgun.key'] = '12345';
 
-        $validSignature = hash_hmac('sha256', $timestamp . $token, '12345');
+        $validSignature = hash_hmac('sha256', $timestamp.$token, '12345');
 
         $this->post('/laravel-mailbox/mailgun/mime', [
             'body-mime' => 'mime',
             'timestamp' => $timestamp,
             'token' => $token,
-            'signature' => $validSignature
+            'signature' => $validSignature,
         ])->assertStatus(401);
     }
-
-}
+}