Apply fixes from StyleCI (#58)

mpociot · web-flow · commit 5839bdbc1da7 · 2020-03-09T16:38:44.000+01:00
diff --git a/src/Console/CleanEmails.php b/src/Console/CleanEmails.php
@@ -2,9 +2,9 @@
 
 namespace BeyondCode\Mailbox\Console;
 
+use BeyondCode\Mailbox\InboundEmail;
 use Carbon\Carbon;
 use Illuminate\Console\Command;
-use BeyondCode\Mailbox\InboundEmail;
 
 class CleanEmails extends Command
 {
diff --git a/src/Drivers/Log.php b/src/Drivers/Log.php
@@ -2,8 +2,8 @@
 
 namespace BeyondCode\Mailbox\Drivers;
 
-use BeyondCode\Mailbox\InboundEmail;
 use BeyondCode\Mailbox\Facades\Mailbox;
+use BeyondCode\Mailbox\InboundEmail;
 use Illuminate\Mail\Events\MessageSent;
 
 class Log implements DriverInterface
diff --git a/src/Drivers/MailCare.php b/src/Drivers/MailCare.php
@@ -2,8 +2,8 @@
 
 namespace BeyondCode\Mailbox\Drivers;
 
-use Illuminate\Support\Facades\Route;
 use BeyondCode\Mailbox\Http\Controllers\MailCareController;
+use Illuminate\Support\Facades\Route;
 
 class MailCare implements DriverInterface
 {
diff --git a/src/Drivers/Mailgun.php b/src/Drivers/Mailgun.php
@@ -2,8 +2,8 @@
 
 namespace BeyondCode\Mailbox\Drivers;
 
-use Illuminate\Support\Facades\Route;
 use BeyondCode\Mailbox\Http\Controllers\MailgunController;
+use Illuminate\Support\Facades\Route;
 
 class Mailgun implements DriverInterface
 {
diff --git a/src/Drivers/Postmark.php b/src/Drivers/Postmark.php
@@ -2,8 +2,8 @@
 
 namespace BeyondCode\Mailbox\Drivers;
 
-use Illuminate\Support\Facades\Route;
 use BeyondCode\Mailbox\Http\Controllers\PostmarkController;
+use Illuminate\Support\Facades\Route;
 
 class Postmark implements DriverInterface
 {
diff --git a/src/Drivers/SendGrid.php b/src/Drivers/SendGrid.php
@@ -2,8 +2,8 @@
 
 namespace BeyondCode\Mailbox\Drivers;
 
-use Illuminate\Support\Facades\Route;
 use BeyondCode\Mailbox\Http\Controllers\SendGridController;
+use Illuminate\Support\Facades\Route;
 
 class SendGrid implements DriverInterface
 {
diff --git a/src/Http/Controllers/MailCareController.php b/src/Http/Controllers/MailCareController.php
@@ -2,9 +2,9 @@
 
 namespace BeyondCode\Mailbox\Http\Controllers;
 
-use Illuminate\Routing\Controller;
 use BeyondCode\Mailbox\Facades\Mailbox;
 use BeyondCode\Mailbox\Http\Requests\MailCareRequest;
+use Illuminate\Routing\Controller;
 
 class MailCareController extends Controller
 {
diff --git a/src/Http/Controllers/PostmarkController.php b/src/Http/Controllers/PostmarkController.php
@@ -2,9 +2,9 @@
 
 namespace BeyondCode\Mailbox\Http\Controllers;
 
-use Illuminate\Routing\Controller;
 use BeyondCode\Mailbox\Facades\Mailbox;
 use BeyondCode\Mailbox\Http\Requests\PostmarkRequest;
+use Illuminate\Routing\Controller;
 
 class PostmarkController extends Controller
 {
diff --git a/src/Http/Controllers/SendGridController.php b/src/Http/Controllers/SendGridController.php
@@ -2,9 +2,9 @@
 
 namespace BeyondCode\Mailbox\Http\Controllers;
 
-use Illuminate\Routing\Controller;
 use BeyondCode\Mailbox\Facades\Mailbox;
 use BeyondCode\Mailbox\Http\Requests\SendGridRequest;
+use Illuminate\Routing\Controller;
 
 class SendGridController extends Controller
 {
diff --git a/src/Http/Requests/MailCareRequest.php b/src/Http/Requests/MailCareRequest.php
@@ -3,8 +3,8 @@
 namespace BeyondCode\Mailbox\Http\Requests;
 
 use BeyondCode\Mailbox\InboundEmail;
-use Illuminate\Support\Facades\Validator;
 use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Support\Facades\Validator;
 
 class MailCareRequest extends FormRequest
 {
diff --git a/src/Http/Requests/MailgunRequest.php b/src/Http/Requests/MailgunRequest.php
@@ -2,10 +2,10 @@
 
 namespace BeyondCode\Mailbox\Http\Requests;
 
-use Carbon\Carbon;
 use BeyondCode\Mailbox\InboundEmail;
-use Illuminate\Support\Facades\Validator;
+use Carbon\Carbon;
 use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Support\Facades\Validator;
 
 class MailgunRequest extends FormRequest
 {
diff --git a/src/Http/Requests/PostmarkRequest.php b/src/Http/Requests/PostmarkRequest.php
@@ -3,8 +3,8 @@
 namespace BeyondCode\Mailbox\Http\Requests;
 
 use BeyondCode\Mailbox\InboundEmail;
-use Illuminate\Support\Facades\Validator;
 use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Support\Facades\Validator;
 
 class PostmarkRequest extends FormRequest
 {
diff --git a/src/Http/Requests/SendGridRequest.php b/src/Http/Requests/SendGridRequest.php
@@ -3,8 +3,8 @@
 namespace BeyondCode\Mailbox\Http\Requests;
 
 use BeyondCode\Mailbox\InboundEmail;
-use Illuminate\Support\Facades\Validator;
 use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Support\Facades\Validator;
 
 class SendGridRequest extends FormRequest
 {
diff --git a/src/InboundEmail.php b/src/InboundEmail.php
@@ -3,15 +3,15 @@
 namespace BeyondCode\Mailbox;
 
 use Carbon\Carbon;
-use Illuminate\Support\Str;
-use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\Mail;
 use EmailReplyParser\EmailReplyParser;
 use Illuminate\Contracts\Mail\Mailable;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Mail;
+use Illuminate\Support\Str;
 use ZBateson\MailMimeParser\Header\AddressHeader;
-use ZBateson\MailMimeParser\Message as MimeMessage;
 use ZBateson\MailMimeParser\Header\Part\AddressPart;
+use ZBateson\MailMimeParser\Message as MimeMessage;
 use ZBateson\MailMimeParser\Message\Part\MessagePart;
 
 class InboundEmail extends Model
diff --git a/src/MailboxManager.php b/src/MailboxManager.php
@@ -2,12 +2,12 @@
 
 namespace BeyondCode\Mailbox;
 
-use Illuminate\Support\Manager;
 use BeyondCode\Mailbox\Drivers\Log;
-use BeyondCode\Mailbox\Drivers\Mailgun;
 use BeyondCode\Mailbox\Drivers\MailCare;
+use BeyondCode\Mailbox\Drivers\Mailgun;
 use BeyondCode\Mailbox\Drivers\Postmark;
 use BeyondCode\Mailbox\Drivers\SendGrid;
+use Illuminate\Support\Manager;
 
 class MailboxManager extends Manager
 {
diff --git a/src/MailboxServiceProvider.php b/src/MailboxServiceProvider.php
@@ -2,11 +2,11 @@
 
 namespace BeyondCode\Mailbox;
 
-use Illuminate\Support\Facades\Route;
-use BeyondCode\Mailbox\Routing\Router;
 use BeyondCode\Mailbox\Facades\Mailbox;
-use Illuminate\Support\ServiceProvider;
 use BeyondCode\Mailbox\Http\Middleware\MailboxBasicAuthentication;
+use BeyondCode\Mailbox\Routing\Router;
+use Illuminate\Support\Facades\Route;
+use Illuminate\Support\ServiceProvider;
 
 class MailboxServiceProvider extends ServiceProvider
 {
diff --git a/src/Routing/Route.php b/src/Routing/Route.php
@@ -2,15 +2,15 @@
 
 namespace BeyondCode\Mailbox\Routing;
 
-use ReflectionFunction;
-use Illuminate\Support\Str;
-use Illuminate\Support\Collection;
-use Illuminate\Container\Container;
-use BeyondCode\Mailbox\InboundEmail;
 use BeyondCode\Mailbox\Concerns\HandlesParameters;
+use BeyondCode\Mailbox\Concerns\HandlesRegularExpressions;
+use BeyondCode\Mailbox\InboundEmail;
+use Illuminate\Container\Container;
 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
 {
diff --git a/src/Routing/RouteCollection.php b/src/Routing/RouteCollection.php
@@ -2,8 +2,8 @@
 
 namespace BeyondCode\Mailbox\Routing;
 
-use Illuminate\Support\Collection;
 use BeyondCode\Mailbox\InboundEmail;
+use Illuminate\Support\Collection;
 
 class RouteCollection
 {
diff --git a/src/Routing/Router.php b/src/Routing/Router.php
@@ -2,10 +2,10 @@
 
 namespace BeyondCode\Mailbox\Routing;
 
-use Illuminate\Support\Collection;
-use Illuminate\Container\Container;
 use BeyondCode\Mailbox\InboundEmail;
 use BeyondCode\Mailbox\MailboxManager;
+use Illuminate\Container\Container;
+use Illuminate\Support\Collection;
 use Illuminate\Support\Traits\ForwardsCalls;
 
 class Router
@@ -31,22 +31,22 @@ public function __construct(Container $container = null)
         $this->routes = new RouteCollection;
     }
 
-    public function from(string $pattern, $action) : Route
+    public function from(string $pattern, $action): Route
     {
         return $this->addRoute(Route::FROM, $pattern, $action);
     }
 
-    public function to(string $pattern, $action) : Route
+    public function to(string $pattern, $action): Route
     {
         return $this->addRoute(Route::TO, $pattern, $action);
     }
 
-    public function cc(string $pattern, $action) : Route
+    public function cc(string $pattern, $action): Route
     {
         return $this->addRoute(Route::CC, $pattern, $action);
     }
 
-    public function subject(string $pattern, $action) : Route
+    public function subject(string $pattern, $action): Route
     {
         return $this->addRoute(Route::SUBJECT, $pattern, $action);
     }
@@ -61,7 +61,7 @@ public function catchAll($action)
         $this->catchAllRoute = $this->createRoute(Route::CATCH_ALL, '', $action);
     }
 
-    protected function addRoute(string $subject, string $pattern, $action) : Route
+    protected function addRoute(string $subject, string $pattern, $action): Route
     {
         $route = $this->createRoute($subject, $pattern, $action);
 
@@ -70,7 +70,7 @@ protected function addRoute(string $subject, string $pattern, $action) : Route
         return $route;
     }
 
-    protected function createRoute(string $subject, string $pattern, $action) : Route
+    protected function createRoute(string $subject, string $pattern, $action): Route
     {
         return (new Route($subject, $pattern, $action))
             ->setContainer($this->container);
diff --git a/tests/Console/CleanEmailsTest.php b/tests/Console/CleanEmailsTest.php
@@ -3,11 +3,11 @@
 namespace BeyondCode\Mailbox\Tests\Console;
 
 use Artisan;
-use Carbon\Carbon;
-use Illuminate\Support\Str;
-use Illuminate\Support\Collection;
 use BeyondCode\Mailbox\InboundEmail;
 use BeyondCode\Mailbox\Tests\TestCase;
+use Carbon\Carbon;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Str;
 
 class CleanEmailsTest extends TestCase
 {
diff --git a/tests/Drivers/LogTest.php b/tests/Drivers/LogTest.php
@@ -2,11 +2,11 @@
 
 namespace BeyondCode\Mailbox\Tests\Drivers;
 
-use Illuminate\Mail\Mailable;
+use BeyondCode\Mailbox\Facades\Mailbox;
 use BeyondCode\Mailbox\InboundEmail;
-use Illuminate\Support\Facades\Mail;
 use BeyondCode\Mailbox\Tests\TestCase;
-use BeyondCode\Mailbox\Facades\Mailbox;
+use Illuminate\Mail\Mailable;
+use Illuminate\Support\Facades\Mail;
 
 class LogTest extends TestCase
 {
diff --git a/tests/InboundEmailTest.php b/tests/InboundEmailTest.php
@@ -2,10 +2,10 @@
 
 namespace BeyondCode\Mailbox\Tests;
 
-use Illuminate\Mail\Mailable;
+use BeyondCode\Mailbox\Facades\Mailbox;
 use BeyondCode\Mailbox\InboundEmail;
+use Illuminate\Mail\Mailable;
 use Illuminate\Support\Facades\Mail;
-use BeyondCode\Mailbox\Facades\Mailbox;
 
 class InboundEmailTest extends TestCase
 {
diff --git a/tests/MailboxRouteCollectionTest.php b/tests/MailboxRouteCollectionTest.php
@@ -2,10 +2,10 @@
 
 namespace BeyondCode\Mailbox\Tests;
 
-use Zend\Mail\Message as TestMail;
 use BeyondCode\Mailbox\InboundEmail;
 use BeyondCode\Mailbox\Routing\Route;
 use BeyondCode\Mailbox\Routing\RouteCollection;
+use Zend\Mail\Message as TestMail;
 
 class MailboxRouteCollectionTest extends TestCase
 {
diff --git a/tests/MailboxRouteTest.php b/tests/MailboxRouteTest.php
@@ -2,9 +2,9 @@
 
 namespace BeyondCode\Mailbox\Tests;
 
-use Zend\Mail\Message as TestMail;
 use BeyondCode\Mailbox\InboundEmail;
 use BeyondCode\Mailbox\Routing\Route;
+use Zend\Mail\Message as TestMail;
 
 class MailboxRouteTest extends TestCase
 {

Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,9 @@`
`2`	`2`
`3`	`3`	`namespace BeyondCode\Mailbox\Console;`
`4`	`4`
	`5`	`+use BeyondCode\Mailbox\InboundEmail;`
`5`	`6`	`use Carbon\Carbon;`
`6`	`7`	`use Illuminate\Console\Command;`
`7`		`-use BeyondCode\Mailbox\InboundEmail;`
`8`	`8`
`9`	`9`	`class CleanEmails extends Command`
`10`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,8 @@`
`2`	`2`
`3`	`3`	`namespace BeyondCode\Mailbox\Drivers;`
`4`	`4`
`5`		`-use Illuminate\Support\Facades\Route;`
`6`	`5`	`use BeyondCode\Mailbox\Http\Controllers\MailCareController;`
	`6`	`+use Illuminate\Support\Facades\Route;`
`7`	`7`
`8`	`8`	`class MailCare implements DriverInterface`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,9 @@`
`2`	`2`
`3`	`3`	`namespace BeyondCode\Mailbox\Http\Controllers;`
`4`	`4`
`5`		`-use Illuminate\Routing\Controller;`
`6`	`5`	`use BeyondCode\Mailbox\Facades\Mailbox;`
`7`	`6`	`use BeyondCode\Mailbox\Http\Requests\MailCareRequest;`
	`7`	`+use Illuminate\Routing\Controller;`
`8`	`8`
`9`	`9`	`class MailCareController extends Controller`
`10`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@`
`3`	`3`	`namespace BeyondCode\Mailbox\Http\Requests;`
`4`	`4`
`5`	`5`	`use BeyondCode\Mailbox\InboundEmail;`
`6`		`-use Illuminate\Support\Facades\Validator;`
`7`	`6`	`use Illuminate\Foundation\Http\FormRequest;`
	`7`	`+use Illuminate\Support\Facades\Validator;`
`8`	`8`
`9`	`9`	`class MailCareRequest extends FormRequest`
`10`	`10`	`{`