cs

tomwelch · Jul 19, 2017 · 96f8167 · 96f8167
1 parent 6a21999
commit 96f8167
Show file tree

Hide file tree

Showing 94 changed files with 191 additions and 191 deletions.
diff --git a/.php_cs b/.php_cs
@@ -1,8 +1,8 @@
 <?php
 
 $finder = Symfony\Component\Finder\Finder::create()
-    ->notPath('bootstrap/cache')
-    ->notPath('storage/*')
+    ->notPath('bootstrap')
+    ->notPath('storage')
     ->notPath('vendor')
     ->in(__DIR__)
     ->name('*.php')
@@ -16,7 +16,7 @@ return PhpCsFixer\Config::create()
     ->setRules([
         '@PSR2' => true,
         'array_syntax' => ['syntax' => 'short'],
-        'ordered_imports' => ['sortAlgorithm' => 'length'],
+        'ordered_imports' => ['sortAlgorithm' => 'alpha'],
         'no_unused_imports' => true,
     ])
     ->setFinder($finder);
diff --git a/app/Console/Commands/ClearBeanstalkdQueue.php b/app/Console/Commands/ClearBeanstalkdQueue.php
@@ -2,8 +2,8 @@
 
 namespace App\Console\Commands;
 
-use Queue;
 use Illuminate\Console\Command;
+use Queue;
 use Symfony\Component\Console\Input\InputArgument;
 
 class ClearBeanstalkdQueue extends Command

diff --git a/app/Console/Commands/PrefetchAnalyticsData.php b/app/Console/Commands/PrefetchAnalyticsData.php
@@ -3,8 +3,8 @@
 namespace App\Console\Commands;
 
 use Analytics;
-use Spatie\Analytics\Period;
 use Illuminate\Console\Command;
+use Spatie\Analytics\Period;
 
 class PrefetchAnalyticsData extends Command
 {

diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
@@ -2,12 +2,12 @@
 
 namespace App\Exceptions;
 
+use Bugsnag\BugsnagLaravel\BugsnagExceptionHandler as BugsnagExceptionHandler;
 use Exception;
-use Illuminate\Http\Response;
 use Illuminate\Auth\AuthenticationException;
-use Illuminate\Validation\ValidationException;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
-use Bugsnag\BugsnagLaravel\BugsnagExceptionHandler as BugsnagExceptionHandler;
+use Illuminate\Http\Response;
+use Illuminate\Validation\ValidationException;
 
 class Handler extends ExceptionHandler
 {

diff --git a/app/Http/Controllers/Back/ActivitylogController.php b/app/Http/Controllers/Back/ActivitylogController.php
@@ -2,8 +2,8 @@
 
 namespace App\Http\Controllers\Back;
 
-use Spatie\Activitylog\Models\Activity;
 use Illuminate\Contracts\Pagination\Paginator;
+use Spatie\Activitylog\Models\Activity;
 
 class ActivitylogController
 {

diff --git a/app/Http/Controllers/Back/AdministratorsController.php b/app/Http/Controllers/Back/AdministratorsController.php
@@ -2,13 +2,13 @@
 
 namespace App\Http\Controllers\Back;
 
-use Illuminate\Http\Request;
-use Illuminate\Validation\Rule;
-use App\Services\Auth\Back\User;
 use App\Services\Auth\Back\Enums\UserRole;
 use App\Services\Auth\Back\Enums\UserStatus;
 use App\Services\Auth\Back\Events\UserCreated;
+use App\Services\Auth\Back\User;
 use Illuminate\Foundation\Validation\ValidatesRequests;
+use Illuminate\Http\Request;
+use Illuminate\Validation\Rule;
 
 class AdministratorsController
 {

diff --git a/app/Http/Controllers/Back/Api/ContentBlockController.php b/app/Http/Controllers/Back/Api/ContentBlockController.php
@@ -2,12 +2,12 @@
 
 namespace App\Http\Controllers\Back\Api;
 
-use App\Models\ContentBlock;
-use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
+use App\Models\ContentBlock;
+use App\Models\Transformers\ContentBlockTransformer;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
-use App\Models\Transformers\ContentBlockTransformer;
 
 class ContentBlockController extends Controller
 {

diff --git a/app/Http/Controllers/Back/Api/MediaLibraryController.php b/app/Http/Controllers/Back/Api/MediaLibraryController.php
@@ -2,14 +2,14 @@
 
 namespace App\Http\Controllers\Back\Api;
 
+use App\Http\Controllers\Controller;
+use App\Models\Transformers\MediaTransformer;
 use Exception;
 use Illuminate\Http\Request;
-use Spatie\MediaLibrary\Media;
 use Illuminate\Http\UploadedFile;
 use Illuminate\Support\Collection;
-use App\Http\Controllers\Controller;
-use App\Models\Transformers\MediaTransformer;
 use Illuminate\Validation\ValidationException;
+use Spatie\MediaLibrary\Media;
 
 class MediaLibraryController extends Controller
 {

diff --git a/app/Http/Controllers/Back/ArticlesController.php b/app/Http/Controllers/Back/ArticlesController.php
@@ -3,10 +3,10 @@
 namespace App\Http\Controllers\Back;
 
 use App\Models\Article;
-use Illuminate\Http\Request;
 use App\Models\Enums\SpecialArticle;
 use App\Repositories\ArticleRepository;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Http\Request;
 
 class ArticlesController extends Controller
 {

diff --git a/app/Http/Controllers/Back/Auth/ForgotPasswordController.php b/app/Http/Controllers/Back/Auth/ForgotPasswordController.php
@@ -2,10 +2,10 @@
 
 namespace App\Http\Controllers\Back\Auth;
 
-use Auth;
-use Password;
 use App\Http\Controllers\Controller;
+use Auth;
 use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
+use Password;
 
 class ForgotPasswordController extends Controller
 {

diff --git a/app/Http/Controllers/Back/Auth/LoginController.php b/app/Http/Controllers/Back/Auth/LoginController.php
@@ -2,11 +2,11 @@
 
 namespace App\Http\Controllers\Back\Auth;
 
-use Auth;
-use Password;
-use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
+use Auth;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
+use Illuminate\Http\Request;
+use Password;
 
 class LoginController extends Controller
 {

diff --git a/app/Http/Controllers/Back/Auth/RegisterController.php b/app/Http/Controllers/Back/Auth/RegisterController.php
@@ -2,13 +2,13 @@
 
 namespace App\Http\Controllers\Back\Auth;
 
-use Auth;
+use App\Http\Controllers\Controller;
 use App\User;
-use Password;
+use Auth;
 use Exception;
-use Validator;
-use App\Http\Controllers\Controller;
 use Illuminate\Foundation\Auth\RegistersUsers;
+use Password;
+use Validator;
 
 class RegisterController extends Controller
 {

diff --git a/app/Http/Controllers/Back/Auth/ResetPasswordController.php b/app/Http/Controllers/Back/Auth/ResetPasswordController.php
@@ -2,12 +2,12 @@
 
 namespace App\Http\Controllers\Back\Auth;
 
-use Auth;
-use Password;
-use Illuminate\Http\Request;
-use App\Services\Auth\Back\User;
 use App\Http\Controllers\Controller;
+use App\Services\Auth\Back\User;
+use Auth;
 use Illuminate\Foundation\Auth\ResetsPasswords;
+use Illuminate\Http\Request;
+use Password;
 
 class ResetPasswordController extends Controller
 {

diff --git a/app/Http/Controllers/Back/Controller.php b/app/Http/Controllers/Back/Controller.php
@@ -2,13 +2,13 @@
 
 namespace App\Http\Controllers\Back;
 
-use ReflectionClass;
-use Illuminate\Http\Request;
-use Illuminate\Support\Collection;
 use App\Models\Scopes\NonDraftScope;
-use Illuminate\Support\Facades\Cache;
 use Illuminate\Database\Eloquent\Model as Eloquent;
 use Illuminate\Foundation\Validation\ValidatesRequests;
+use Illuminate\Http\Request;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Cache;
+use ReflectionClass;
 
 abstract class Controller
 {

diff --git a/app/Http/Controllers/Back/DashboardController.php b/app/Http/Controllers/Back/DashboardController.php
@@ -3,9 +3,9 @@
 namespace App\Http\Controllers\Back;
 
 use Analytics;
-use Spatie\Analytics\Period;
 use Illuminate\Support\Collection;
 use Spatie\Activitylog\Models\Activity;
+use Spatie\Analytics\Period;
 
 class DashboardController
 {

diff --git a/app/Http/Controllers/Back/FragmentsController.php b/app/Http/Controllers/Back/FragmentsController.php
@@ -2,10 +2,10 @@
 
 namespace App\Http\Controllers\Back;
 
+use App\Http\Controllers\Back\Traits\UpdateMedia;
 use App\Models\Fragment;
 use Illuminate\Http\Request;
 use Spatie\FragmentImporter\Exporter;
-use App\Http\Controllers\Back\Traits\UpdateMedia;
 
 class FragmentsController
 {

diff --git a/app/Http/Controllers/Back/MembersController.php b/app/Http/Controllers/Back/MembersController.php
@@ -2,13 +2,13 @@
 
 namespace App\Http\Controllers\Back;
 
-use Illuminate\Http\Request;
-use Illuminate\Validation\Rule;
-use App\Services\Auth\Front\User;
 use App\Services\Auth\Front\Enums\UserRole;
 use App\Services\Auth\Front\Enums\UserStatus;
-use Illuminate\Foundation\Validation\ValidatesRequests;
 use App\Services\Auth\Front\Events\UserCreatedThroughBack;
+use App\Services\Auth\Front\User;
+use Illuminate\Foundation\Validation\ValidatesRequests;
+use Illuminate\Http\Request;
+use Illuminate\Validation\Rule;
 
 class MembersController
 {

diff --git a/app/Http/Controllers/Back/NewsController.php b/app/Http/Controllers/Back/NewsController.php
@@ -2,8 +2,8 @@
 
 namespace App\Http\Controllers\Back;
 
-use Carbon\Carbon;
 use App\Models\NewsItem;
+use Carbon\Carbon;
 use Illuminate\Http\Request;
 
 class NewsController extends Controller

diff --git a/app/Http/Controllers/Back/Traits/UpdateDates.php b/app/Http/Controllers/Back/Traits/UpdateDates.php
@@ -3,8 +3,8 @@
 namespace App\Http\Controllers\Back\Traits;
 
 use Carbon\Carbon;
-use Illuminate\Http\Request;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Http\Request;
 
 trait UpdateDates
 {

diff --git a/app/Http/Controllers/Back/Traits/UpdateMedia.php b/app/Http/Controllers/Back/Traits/UpdateMedia.php
@@ -2,9 +2,9 @@
 
 namespace App\Http\Controllers\Back\Traits;
 
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Http\Request;
 use Spatie\MediaLibrary\Media;
-use Illuminate\Database\Eloquent\Model;
 
 trait UpdateMedia
 {

diff --git a/app/Http/Controllers/Back/Traits/UpdateOnlineToggle.php b/app/Http/Controllers/Back/Traits/UpdateOnlineToggle.php
@@ -2,8 +2,8 @@
 
 namespace App\Http\Controllers\Back\Traits;
 
-use Illuminate\Http\Request;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Http\Request;
 
 trait UpdateOnlineToggle
 {

diff --git a/app/Http/Controllers/Back/Traits/UpdateSeoValues.php b/app/Http/Controllers/Back/Traits/UpdateSeoValues.php
@@ -2,11 +2,11 @@
 
 namespace App\Http\Controllers\Back\Traits;
 
-use Spatie\Regex\Regex;
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Http\Request;
-use Spatie\Regex\MatchResult;
 use Illuminate\Support\Collection;
-use Illuminate\Database\Eloquent\Model;
+use Spatie\Regex\MatchResult;
+use Spatie\Regex\Regex;
 
 trait UpdateSeoValues
 {

diff --git a/app/Http/Controllers/Back/Traits/UpdateTags.php b/app/Http/Controllers/Back/Traits/UpdateTags.php
@@ -3,8 +3,8 @@
 namespace App\Http\Controllers\Back\Traits;
 
 use App\Models\Tag;
-use Illuminate\Http\Request;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Http\Request;
 
 trait UpdateTags
 {

diff --git a/app/Http/Controllers/Back/Traits/UpdateTranslations.php b/app/Http/Controllers/Back/Traits/UpdateTranslations.php
@@ -2,8 +2,8 @@
 
 namespace App\Http\Controllers\Back\Traits;
 
-use Illuminate\Http\Request;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Http\Request;
 
 trait UpdateTranslations
 {

diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
@@ -2,10 +2,10 @@
 
 namespace App\Http\Controllers;
 
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Foundation\Bus\DispatchesJobs;
-use Illuminate\Routing\Controller as BaseController;
 use Illuminate\Foundation\Validation\ValidatesRequests;
-use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
+use Illuminate\Routing\Controller as BaseController;
 
 abstract class Controller extends BaseController
 {

diff --git a/app/Http/Controllers/Front/Api/Controller.php b/app/Http/Controllers/Front/Api/Controller.php
@@ -2,8 +2,8 @@
 
 namespace App\Http\Controllers\Front\Api;
 
-use Symfony\Component\HttpFoundation\Response;
 use App\Http\Controllers\Controller as BaseController;
+use Symfony\Component\HttpFoundation\Response;
 
 class Controller extends BaseController
 {

diff --git a/app/Http/Controllers/Front/Api/NewsletterController.php b/app/Http/Controllers/Front/Api/NewsletterController.php
@@ -2,8 +2,8 @@
 
 namespace App\Http\Controllers\Front\Api;
 
-use Newsletter;
 use App\Http\Requests\Front\Api\NewsletterSubscriptionRequest;
+use Newsletter;
 
 class NewsletterController extends Controller
 {

diff --git a/app/Http/Controllers/Front/Auth/ForgotPasswordController.php b/app/Http/Controllers/Front/Auth/ForgotPasswordController.php
@@ -2,10 +2,10 @@
 
 namespace App\Http\Controllers\Front\Auth;
 
-use Auth;
-use Password;
 use App\Http\Controllers\Controller;
+use Auth;
 use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
+use Password;
 
 class ForgotPasswordController extends Controller
 {

diff --git a/app/Http/Controllers/Front/Auth/LoginController.php b/app/Http/Controllers/Front/Auth/LoginController.php
@@ -2,11 +2,11 @@
 
 namespace App\Http\Controllers\Front\Auth;
 
-use Auth;
-use Password;
-use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
+use Auth;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
+use Illuminate\Http\Request;
+use Password;
 
 class LoginController extends Controller
 {