Updated to use collection count (#324)

* Updated to use collection count * Apply fixes from StyleCI (#325) Co-authored-by: Roshan Gautam <[email protected]> Co-authored-by: Roshan Gautam <[email protected]> Co-authored-by: Roshan Gautam <[email protected]>
codestudiohq · Mar 22, 2022 · 60cb88f · 60cb88f
1 parent 41c588b
commit 60cb88f
Show file tree

Hide file tree

Showing 22 changed files with 44 additions and 39 deletions.
diff --git a/database/migrations/2019_09_25_103421_update_task_results_duration_type.php b/database/migrations/2019_09_25_103421_update_task_results_duration_type.php
@@ -28,7 +28,7 @@ public function down()
     }
 
     /**
-     * @param bool $toFloat
+     * @param  bool  $toFloat
      */
     private function migrateDurationValues(bool $toFloat = true)
     {

diff --git a/src/Console/Commands/ListSchedule.php b/src/Console/Commands/ListSchedule.php
@@ -32,7 +32,7 @@ class ListSchedule extends Command
     /**
      * Create a new command instance.
      *
-     * @param Schedule $schedule
+     * @param  Schedule  $schedule
      * @return void
      */
     public function __construct(Schedule $schedule)

diff --git a/src/Contracts/TaskInterface.php b/src/Contracts/TaskInterface.php
@@ -21,28 +21,30 @@ public function find($id);
 
     /**
      * Returns all tasks.
+     *
      * @return \Illuminate\Database\Eloquent\Collection
      */
     public function findAll();
 
     /**
      * Returns all active tasks.
+     *
      * @return \Illuminate\Database\Eloquent\Collection
      */
     public function findAllActive();
 
     /**
      * Creates a new task with the given data.
      *
-     * @param  array $input
+     * @param  array  $input
      * @return \Studio\Totem\Task
      */
     public function store(array $input);
 
     /**
      * Updates the given task with the given data.
      *
-     * @param  array $input
+     * @param  array  $input
      * @param  \Studio\Totem\Task  $task
      * @return \Studio\Totem\Task
      */

diff --git a/src/Events/Creating.php b/src/Events/Creating.php
@@ -21,7 +21,7 @@ class Creating implements ShouldBroadcast
     /**
      * Create a new event instance.
      *
-     * @param array $input
+     * @param  array  $input
      */
     public function __construct(array $input)
     {

diff --git a/src/Events/Deleted.php b/src/Events/Deleted.php
@@ -7,8 +7,8 @@ class Deleted extends Event
     /**
      * Create a new event instance.
      *
-     * @param array $input
-     * @param Task $task
+     * @param  array  $input
+     * @param  Task  $task
      */
     public function __construct()
     {

diff --git a/src/Events/Executed.php b/src/Events/Executed.php
@@ -10,8 +10,8 @@ class Executed extends BroadcastingEvent
     /**
      * Executed constructor.
      *
-     * @param Task $task
-     * @param string $started
+     * @param  Task  $task
+     * @param  string  $started
      */
     public function __construct(Task $task, $started, $output)
     {

diff --git a/src/Events/TaskEvent.php b/src/Events/TaskEvent.php
@@ -18,7 +18,7 @@ class TaskEvent extends Event
     /**
      * Constructor.
      *
-     * @param Task $task
+     * @param  Task  $task
      */
     public function __construct(Task $task)
     {

diff --git a/src/Events/Updating.php b/src/Events/Updating.php
@@ -16,8 +16,8 @@ class Updating extends BroadcastingEvent
     /**
      * Create a new event instance.
      *
-     * @param array $input
-     * @param Task $task
+     * @param  array  $input
+     * @param  Task  $task
      */
     public function __construct(array $input, Task $task)
     {

diff --git a/src/Http/Controllers/ActiveTasksController.php b/src/Http/Controllers/ActiveTasksController.php
@@ -13,7 +13,7 @@ class ActiveTasksController extends Controller
     private $tasks;
 
     /**
-     * @param TaskInterface $tasks
+     * @param  TaskInterface  $tasks
      */
     public function __construct(TaskInterface $tasks)
     {

diff --git a/src/Http/Controllers/ExecuteTasksController.php b/src/Http/Controllers/ExecuteTasksController.php
@@ -13,7 +13,7 @@ class ExecuteTasksController extends Controller
     private $tasks;
 
     /**
-     * @param TaskInterface $tasks
+     * @param  TaskInterface  $tasks
      */
     public function __construct(TaskInterface $tasks)
     {

diff --git a/src/Http/Controllers/ExportTasksController.php b/src/Http/Controllers/ExportTasksController.php
@@ -13,7 +13,8 @@ class ExportTasksController extends Controller
 
     /**
      * ExportTasksController constructor.
-     * @param TaskInterface $tasks
+     *
+     * @param  TaskInterface  $tasks
      */
     public function __construct(TaskInterface $tasks)
     {

diff --git a/src/Http/Controllers/ImportTasksController.php b/src/Http/Controllers/ImportTasksController.php
@@ -14,7 +14,8 @@ class ImportTasksController extends Controller
 
     /**
      * ImportTasksController constructor.
-     * @param TaskInterface $tasks
+     *
+     * @param  TaskInterface  $tasks
      */
     public function __construct(TaskInterface $tasks)
     {
@@ -25,7 +26,9 @@ public function __construct(TaskInterface $tasks)
 
     /**
      * Import tasks from a json file.
-     * @param \Studio\Totem\Http\Requests\ImportRequest $request
+     *
+     * @param  \Studio\Totem\Http\Requests\ImportRequest  $request
+     *
      * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
      */
     public function index(ImportRequest $request)

diff --git a/src/Http/Requests/ImportRequest.php b/src/Http/Requests/ImportRequest.php
@@ -51,6 +51,7 @@ public function messages()
      *
      * @param  array|mixed  $keys
      * @return array
+     *
      * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
      */
     public function all($keys = null)
@@ -68,6 +69,7 @@ public function all($keys = null)
      * Get the validated data from the request.
      *
      * @return array
+     *
      * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
      */
     public function validated()
@@ -84,7 +86,7 @@ public function validated()
     /**
      * * Handle a failed validation attempt.
      *
-     * @param Validator $validator
+     * @param  Validator  $validator
      */
     protected function failedValidation(Validator $validator)
     {

diff --git a/src/Listeners/BuildCache.php b/src/Listeners/BuildCache.php
@@ -19,7 +19,7 @@ public function handle(Event $event)
     /**
      * Rebuild Cache.
      *
-     * @param Event $event
+     * @param  Event  $event
      */
     protected function build(Event $event)
     {

diff --git a/src/Listeners/BustCache.php b/src/Listeners/BustCache.php
@@ -19,7 +19,7 @@ public function handle(Event $event)
     /**
      * Clear Cache.
      *
-     * @param Event $event
+     * @param  Event  $event
      */
     protected function clear(Event $event)
     {

diff --git a/src/Listeners/BustCacheImmediately.php b/src/Listeners/BustCacheImmediately.php
@@ -15,7 +15,7 @@ class BustCacheImmediately
     /**
      * Create the event listener.
      *
-     * @param Container $app
+     * @param  Container  $app
      */
     public function __construct(Container $app)
     {
@@ -35,7 +35,7 @@ public function handle(Event $event)
     /**
      * Clear Cache.
      *
-     * @param Event $event
+     * @param  Event  $event
      */
     protected function clear(Event $event)
     {

diff --git a/src/Listeners/Listener.php b/src/Listeners/Listener.php
@@ -21,8 +21,8 @@ class Listener implements ShouldQueue
     /**
      * Create the event listener.
      *
-     * @param Container $app
-     * @param TaskInterface $tasks
+     * @param  Container  $app
+     * @param  TaskInterface  $tasks
      */
     public function __construct(Container $app, TaskInterface $tasks)
     {

diff --git a/src/Repositories/EloquentTaskRepository.php b/src/Repositories/EloquentTaskRepository.php
@@ -44,7 +44,7 @@ public function builder(): Builder
     /**
      * Find a task by id.
      *
-     * @param int|Task $id
+     * @param  int|Task  $id
      * @return int|Task
      */
     public function find($id)
@@ -87,7 +87,7 @@ public function findAllActive()
     /**
      * Create a new task.
      *
-     * @param array $input
+     * @param  array  $input
      * @return bool|Task
      */
     public function store(array $input)
@@ -108,8 +108,8 @@ public function store(array $input)
     /**
      * Update the given task.
      *
-     * @param array $input
-     * @param Task $task
+     * @param  array  $input
+     * @param  Task  $task
      * @return bool|int|Task
      */
     public function update(array $input, $task)
@@ -130,7 +130,7 @@ public function update(array $input, $task)
     /**
      * Delete the given task.
      *
-     * @param int|Task $id
+     * @param  int|Task  $id
      * @return bool
      */
     public function destroy($id)

diff --git a/src/Task.php b/src/Task.php
@@ -208,7 +208,7 @@ public function autoCleanup()
                     Result::query()
                         ->whereIn('id', $rowsToDelete)
                         ->delete();
-                } while ($rowsToDelete > 0);
+                } while ($rowsToDelete->count() > 0);
             } else {
                 do {
                     $rowsToDelete = $this->results()
@@ -221,7 +221,7 @@ public function autoCleanup()
                     Result::query()
                         ->whereIn('id', $rowsToDelete)
                         ->delete();
-                } while ($rowsToDelete > 0);
+                } while ($rowsToDelete->count() > 0);
             }
         }
     }

diff --git a/src/Totem.php b/src/Totem.php
@@ -22,7 +22,6 @@ class Totem
      * Determine if the given request can access the Totem dashboard.
      *
      * @param  \Illuminate\Http\Request  $request
-     *
      * @return bool
      */
     public static function check($request)
@@ -36,7 +35,6 @@ public static function check($request)
      * Set the callback that should be used to authenticate Totem users.
      *
      * @param  \Closure  $callback
-     *
      * @return static
      */
     public static function auth(Closure $callback)

diff --git a/src/Traits/FrontendSortable.php b/src/Traits/FrontendSortable.php
@@ -7,10 +7,9 @@
 trait FrontendSortable
 {
     /**
-     * @param \Illuminate\Database\Eloquent\Builder $builder
-     * @param array                                 $sortableColumns
-     * @param array                                 $defaultSort
-     *
+     * @param  \Illuminate\Database\Eloquent\Builder  $builder
+     * @param  array  $sortableColumns
+     * @param  array  $defaultSort
      * @return \Illuminate\Database\Eloquent\Builder
      */
     public function scopeSortableBy(Builder $builder, array $sortableColumns, array $defaultSort = ['name' => 'asc']): Builder

diff --git a/tests/Feature/ViewDashboardTest.php b/tests/Feature/ViewDashboardTest.php
@@ -80,8 +80,8 @@ public function view_dashboard_multiple_tasks_with_multiple_results()
     }
 
     /**
-     * @param int $task_count
-     * @param int $result_count
+     * @param  int  $task_count
+     * @param  int  $result_count
      * @return mixed
      */
     private function _get_task_with_results($task_count = 1, $result_count = 1)
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,7 +28,7 @@ public function down() @@
         }
         /**
-         * @param bool $toFloat
+         * @param  bool  $toFloat
          */
         private function migrateDurationValues(bool $toFloat = true)
         {
@@ Expand Down @@