Apply fixes from StyleCI (#210)

roshangautam · qschmick · commit 6d0c648a63f9 · 2020-01-14T11:44:00.000-05:00
diff --git a/database/migrations/2017_08_05_194349_create_tasks_table.php b/database/migrations/2017_08_05_194349_create_tasks_table.php
@@ -1,7 +1,7 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 use Studio\Totem\Database\TotemMigration;
 
 class CreateTasksTable extends TotemMigration
diff --git a/database/migrations/2017_08_05_195539_create_task_frequencies_table.php b/database/migrations/2017_08_05_195539_create_task_frequencies_table.php
@@ -1,7 +1,7 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 use Studio\Totem\Database\TotemMigration;
 
 class CreateTaskFrequenciesTable extends TotemMigration
diff --git a/database/migrations/2017_08_05_201914_create_task_results_table.php b/database/migrations/2017_08_05_201914_create_task_results_table.php
@@ -1,7 +1,7 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 use Studio\Totem\Database\TotemMigration;
 
 class CreateTaskResultsTable extends TotemMigration
diff --git a/database/migrations/2017_08_24_085132_create_frequency_parameters_table.php b/database/migrations/2017_08_24_085132_create_frequency_parameters_table.php
@@ -1,7 +1,7 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 use Studio\Totem\Database\TotemMigration;
 
 class CreateFrequencyParametersTable extends TotemMigration
diff --git a/database/migrations/2017_08_26_083622_alter_tasks_table_add_notifications_fields.php b/database/migrations/2017_08_26_083622_alter_tasks_table_add_notifications_fields.php
@@ -1,7 +1,7 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 use Studio\Totem\Database\TotemMigration;
 
 class AlterTasksTableAddNotificationsFields extends TotemMigration
diff --git a/database/migrations/2018_01_02_121533_alter_tasks_table_add_auto_cleanup_num_and_type_fields.php b/database/migrations/2018_01_02_121533_alter_tasks_table_add_auto_cleanup_num_and_type_fields.php
@@ -1,7 +1,7 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 use Studio\Totem\Database\TotemMigration;
 
 class AlterTasksTableAddAutoCleanupNumAndTypeFields extends TotemMigration
diff --git a/database/migrations/2018_07_03_120000_alter_tasks_table_add_run_on_one_server_support.php b/database/migrations/2018_07_03_120000_alter_tasks_table_add_run_on_one_server_support.php
@@ -1,7 +1,7 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 use Studio\Totem\Database\TotemMigration;
 
 class AlterTasksTableAddRunOnOneServerSupport extends TotemMigration
diff --git a/database/migrations/2018_07_06_165603_add_indexes_for_tasks.php b/database/migrations/2018_07_06_165603_add_indexes_for_tasks.php
@@ -1,7 +1,7 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 use Studio\Totem\Database\TotemMigration;
 
 class AddIndexesForTasks extends TotemMigration
diff --git a/src/Console/Commands/ListSchedule.php b/src/Console/Commands/ListSchedule.php
@@ -4,9 +4,9 @@
 
 use Carbon\Carbon;
 use Cron\CronExpression;
-use Illuminate\Support\Str;
 use Illuminate\Console\Command;
 use Illuminate\Console\Scheduling\Schedule;
+use Illuminate\Support\Str;
 
 class ListSchedule extends Command
 {
diff --git a/src/Events/BroadcastingEvent.php b/src/Events/BroadcastingEvent.php
@@ -2,8 +2,8 @@
 
 namespace Studio\Totem\Events;
 
-use Illuminate\Broadcasting\PrivateChannel;
 use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Broadcasting\PrivateChannel;
 use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
 
 class BroadcastingEvent extends TaskEvent implements ShouldBroadcast
diff --git a/src/Events/Creating.php b/src/Events/Creating.php
@@ -3,11 +3,11 @@
 namespace Studio\Totem\Events;
 
 use Illuminate\Broadcasting\Channel;
-use Illuminate\Queue\SerializesModels;
-use Illuminate\Broadcasting\PrivateChannel;
-use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Broadcasting\PrivateChannel;
 use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
 
 class Creating implements ShouldBroadcast
 {
diff --git a/src/Events/Executed.php b/src/Events/Executed.php
@@ -2,8 +2,8 @@
 
 namespace Studio\Totem\Events;
 
-use Studio\Totem\Task;
 use Studio\Totem\Notifications\TaskCompleted;
+use Studio\Totem\Task;
 
 class Executed extends BroadcastingEvent
 {
diff --git a/src/Events/TaskEvent.php b/src/Events/TaskEvent.php
@@ -2,9 +2,9 @@
 
 namespace Studio\Totem\Events;
 
-use Studio\Totem\Task;
-use Illuminate\Queue\SerializesModels;
 use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
+use Studio\Totem\Task;
 
 class TaskEvent extends Event
 {
diff --git a/src/Events/Updating.php b/src/Events/Updating.php
@@ -2,9 +2,9 @@
 
 namespace Studio\Totem\Events;
 
-use Studio\Totem\Task;
 use Illuminate\Broadcasting\Channel;
 use Illuminate\Broadcasting\PrivateChannel;
+use Studio\Totem\Task;
 
 class Updating extends BroadcastingEvent
 {
diff --git a/src/Http/Controllers/Controller.php b/src/Http/Controllers/Controller.php
@@ -2,8 +2,8 @@
 
 namespace Studio\Totem\Http\Controllers;
 
-use Studio\Totem\Http\Middleware\Authenticate;
 use Illuminate\Routing\Controller as BaseController;
+use Studio\Totem\Http\Middleware\Authenticate;
 
 class Controller extends BaseController
 {
diff --git a/src/Http/Controllers/ExecuteTasksController.php b/src/Http/Controllers/ExecuteTasksController.php
@@ -2,8 +2,8 @@
 
 namespace Studio\Totem\Http\Controllers;
 
-use Studio\Totem\Task;
 use Studio\Totem\Contracts\TaskInterface;
+use Studio\Totem\Task;
 
 class ExecuteTasksController extends Controller
 {
diff --git a/src/Http/Controllers/TasksController.php b/src/Http/Controllers/TasksController.php
@@ -2,11 +2,11 @@
 
 namespace Studio\Totem\Http\Controllers;
 
-use Studio\Totem\Task;
-use Studio\Totem\Totem;
 use Illuminate\Database\Eloquent\Builder;
 use Studio\Totem\Contracts\TaskInterface;
 use Studio\Totem\Http\Requests\TaskRequest;
+use Studio\Totem\Task;
+use Studio\Totem\Totem;
 
 class TasksController extends Controller
 {
diff --git a/src/Http/Requests/ImportRequest.php b/src/Http/Requests/ImportRequest.php
@@ -2,8 +2,8 @@
 
 namespace Studio\Totem\Http\Requests;
 
-use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Contracts\Validation\Validator;
+use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Http\Exceptions\HttpResponseException;
 
 class ImportRequest extends FormRequest
diff --git a/src/Listeners/BustCacheImmediately.php b/src/Listeners/BustCacheImmediately.php
@@ -2,8 +2,8 @@
 
 namespace Studio\Totem\Listeners;
 
-use Studio\Totem\Events\Event;
 use Illuminate\Container\Container;
+use Studio\Totem\Events\Event;
 
 class BustCacheImmediately
 {
diff --git a/src/Listeners/Listener.php b/src/Listeners/Listener.php
@@ -3,8 +3,8 @@
 namespace Studio\Totem\Listeners;
 
 use Illuminate\Container\Container;
-use Studio\Totem\Contracts\TaskInterface;
 use Illuminate\Contracts\Queue\ShouldQueue;
+use Studio\Totem\Contracts\TaskInterface;
 
 class Listener implements ShouldQueue
 {
diff --git a/src/Notifications/TaskCompleted.php b/src/Notifications/TaskCompleted.php
@@ -3,12 +3,12 @@
 namespace Studio\Totem\Notifications;
 
 use Illuminate\Bus\Queueable;
-use Illuminate\Notifications\Notification;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Notifications\Messages\NexmoMessage;
-use Illuminate\Notifications\Messages\SlackMessage;
 use Illuminate\Notifications\Messages\SlackAttachment;
+use Illuminate\Notifications\Messages\SlackMessage;
+use Illuminate\Notifications\Notification;
 
 class TaskCompleted extends Notification implements ShouldQueue
 {
diff --git a/src/Providers/ConsoleServiceProvider.php b/src/Providers/ConsoleServiceProvider.php
@@ -2,10 +2,10 @@
 
 namespace Studio\Totem\Providers;
 
+use Illuminate\Console\Scheduling\Schedule;
+use Illuminate\Support\ServiceProvider;
 use Studio\Totem\Events\Executed;
 use Studio\Totem\Events\Executing;
-use Illuminate\Support\ServiceProvider;
-use Illuminate\Console\Scheduling\Schedule;
 
 class ConsoleServiceProvider extends ServiceProvider
 {
diff --git a/src/Providers/TotemRouteServiceProvider.php b/src/Providers/TotemRouteServiceProvider.php
@@ -2,9 +2,9 @@
 
 namespace Studio\Totem\Providers;
 
-use Studio\Totem\Task;
-use Illuminate\Support\Facades\Route;
 use Illuminate\Foundation\Support\Providers\RouteServiceProvider;
+use Illuminate\Support\Facades\Route;
+use Studio\Totem\Task;
 
 class TotemRouteServiceProvider extends RouteServiceProvider
 {
diff --git a/src/Repositories/EloquentTaskRepository.php b/src/Repositories/EloquentTaskRepository.php
@@ -2,22 +2,22 @@
 
 namespace Studio\Totem\Repositories;
 
-use Studio\Totem\Task;
-use Studio\Totem\Result;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Arr;
+use Illuminate\Support\Facades\Artisan;
+use Illuminate\Support\Facades\Cache;
+use Studio\Totem\Contracts\TaskInterface;
+use Studio\Totem\Events\Activated;
 use Studio\Totem\Events\Created;
-use Studio\Totem\Events\Deleted;
-use Studio\Totem\Events\Updated;
 use Studio\Totem\Events\Creating;
+use Studio\Totem\Events\Deactivated;
+use Studio\Totem\Events\Deleted;
 use Studio\Totem\Events\Deleting;
 use Studio\Totem\Events\Executed;
+use Studio\Totem\Events\Updated;
 use Studio\Totem\Events\Updating;
-use Studio\Totem\Events\Activated;
-use Studio\Totem\Events\Deactivated;
-use Illuminate\Support\Facades\Cache;
-use Illuminate\Support\Facades\Artisan;
-use Illuminate\Database\Eloquent\Builder;
-use Studio\Totem\Contracts\TaskInterface;
+use Studio\Totem\Result;
+use Studio\Totem\Task;
 
 class EloquentTaskRepository implements TaskInterface
 {
@@ -26,7 +26,7 @@ class EloquentTaskRepository implements TaskInterface
      *
      * @return Task
      */
-    public function builder() : Builder
+    public function builder(): Builder
     {
         $result = new Result;
 
diff --git a/src/Result.php b/src/Result.php
@@ -2,8 +2,8 @@
 
 namespace Studio\Totem;
 
-use Illuminate\Support\Facades\DB;
 use Illuminate\Database\Query\Builder;
+use Illuminate\Support\Facades\DB;
 
 class Result extends TotemModel
 {
@@ -26,7 +26,7 @@ public function task()
     /**
      * @return Builder
      */
-    public function getLastRun() : Builder
+    public function getLastRun(): Builder
     {
         return $this->select('ran_at')
             ->whereColumn('task_id', TOTEM_TABLE_PREFIX.'tasks.id')
@@ -38,7 +38,7 @@ public function getLastRun() : Builder
     /**
      * @return Builder
      */
-    public function getAverageRunTime() : Builder
+    public function getAverageRunTime(): Builder
     {
         return $this->select(DB::raw('avg(duration)'))
             ->whereColumn('task_id', TOTEM_TABLE_PREFIX.'tasks.id')
diff --git a/src/Task.php b/src/Task.php
@@ -4,10 +4,10 @@
 
 use Carbon\Carbon;
 use Cron\CronExpression;
-use Illuminate\Support\Str;
-use Studio\Totem\Traits\HasFrequencies;
 use Illuminate\Notifications\Notifiable;
+use Illuminate\Support\Str;
 use Studio\Totem\Traits\FrontendSortable;
+use Studio\Totem\Traits\HasFrequencies;
 
 class Task extends TotemModel
 {
diff --git a/src/Totem.php b/src/Totem.php
@@ -3,9 +3,9 @@
 namespace Studio\Totem;
 
 use Closure;
+use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Schema;
-use Illuminate\Support\Facades\Artisan;
 use Symfony\Component\Console\Command\Command;
 
 class Totem
@@ -91,7 +91,7 @@ public static function getCommands()
     /**
      * @return bool
      */
-    public static function baseTableExists() : bool
+    public static function baseTableExists(): bool
     {
         if (Cache::get('totem.table.'.TOTEM_TABLE_PREFIX.'tasks')) {
             return true;
diff --git a/src/TotemModel.php b/src/TotemModel.php
@@ -2,8 +2,8 @@
 
 namespace Studio\Totem;
 
-use Illuminate\Support\Str;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Str;
 
 class TotemModel extends Model
 {
diff --git a/src/Traits/FrontendSortable.php b/src/Traits/FrontendSortable.php
@@ -13,7 +13,7 @@ trait FrontendSortable
      *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeSortableBy(Builder $builder, array $sortableColumns, array $defaultSort = ['name' => 'asc']) : Builder
+    public function scopeSortableBy(Builder $builder, array $sortableColumns, array $defaultSort = ['name' => 'asc']): Builder
     {
         $request = request();
         $sorted = $request->has('sort_by') && in_array($request->input('sort_by'), $sortableColumns);
diff --git a/src/Traits/HasFrequencies.php b/src/Traits/HasFrequencies.php
@@ -3,12 +3,12 @@
 namespace Studio\Totem\Traits;
 
 use Closure;
-use function request;
-use Studio\Totem\Task;
-use function json_decode;
+use Illuminate\Console\Scheduling\ManagesFrequencies;
 use Illuminate\Support\Arr;
+use function json_decode;
+use function request;
 use Studio\Totem\Frequency;
-use Illuminate\Console\Scheduling\ManagesFrequencies;
+use Studio\Totem\Task;
 
 trait HasFrequencies
 {
diff --git a/src/User.php b/src/User.php
@@ -2,8 +2,8 @@
 
 namespace Studio\Totem;
 
-use Illuminate\Notifications\Notifiable;
 use Illuminate\Foundation\Auth\User as Authenticatable;
+use Illuminate\Notifications\Notifiable;
 
 class User extends Authenticatable
 {
diff --git a/tests/Feature/AuthTest.php b/tests/Feature/AuthTest.php
diff --git a/tests/Feature/ViewDashboardTest.php b/tests/Feature/ViewDashboardTest.php
diff --git a/tests/TestCase.php b/tests/TestCase.php

Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,9 @@`
`4`	`4`
`5`	`5`	`use Carbon\Carbon;`
`6`	`6`	`use Cron\CronExpression;`
`7`		`-use Illuminate\Support\Str;`
`8`	`7`	`use Illuminate\Console\Command;`
`9`	`8`	`use Illuminate\Console\Scheduling\Schedule;`
	`9`	`+use Illuminate\Support\Str;`
`10`	`10`
`11`	`11`	`class ListSchedule extends Command`
`12`	`12`	`{`