Skip to content

Commit 60cb88f

Browse files
Quentin Schmickroshangautam
Quentin Schmick
andauthored
Updated to use collection count (#324)
* Updated to use collection count * Apply fixes from StyleCI (#325) Co-authored-by: Roshan Gautam <roshangautam@users.noreply.github.com> Co-authored-by: Roshan Gautam <roshan.gautam@hotmail.com> Co-authored-by: Roshan Gautam <roshangautam@users.noreply.github.com>
1 parent 41c588b commit 60cb88f

22 files changed

+44
-39
lines changed

database/migrations/2019_09_25_103421_update_task_results_duration_type.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public function down()
2828
}
2929

3030
/**
31-
* @param bool $toFloat
31+
* @param bool $toFloat
3232
*/
3333
private function migrateDurationValues(bool $toFloat = true)
3434
{

src/Console/Commands/ListSchedule.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class ListSchedule extends Command
3232
/**
3333
* Create a new command instance.
3434
*
35-
* @param Schedule $schedule
35+
* @param Schedule $schedule
3636
* @return void
3737
*/
3838
public function __construct(Schedule $schedule)

src/Contracts/TaskInterface.php

+4-2
Original file line numberDiff line numberDiff line change
@@ -21,28 +21,30 @@ public function find($id);
2121

2222
/**
2323
* Returns all tasks.
24+
*
2425
* @return \Illuminate\Database\Eloquent\Collection
2526
*/
2627
public function findAll();
2728

2829
/**
2930
* Returns all active tasks.
31+
*
3032
* @return \Illuminate\Database\Eloquent\Collection
3133
*/
3234
public function findAllActive();
3335

3436
/**
3537
* Creates a new task with the given data.
3638
*
37-
* @param array $input
39+
* @param array $input
3840
* @return \Studio\Totem\Task
3941
*/
4042
public function store(array $input);
4143

4244
/**
4345
* Updates the given task with the given data.
4446
*
45-
* @param array $input
47+
* @param array $input
4648
* @param \Studio\Totem\Task $task
4749
* @return \Studio\Totem\Task
4850
*/

src/Events/Creating.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class Creating implements ShouldBroadcast
2121
/**
2222
* Create a new event instance.
2323
*
24-
* @param array $input
24+
* @param array $input
2525
*/
2626
public function __construct(array $input)
2727
{

src/Events/Deleted.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ class Deleted extends Event
77
/**
88
* Create a new event instance.
99
*
10-
* @param array $input
11-
* @param Task $task
10+
* @param array $input
11+
* @param Task $task
1212
*/
1313
public function __construct()
1414
{

src/Events/Executed.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ class Executed extends BroadcastingEvent
1010
/**
1111
* Executed constructor.
1212
*
13-
* @param Task $task
14-
* @param string $started
13+
* @param Task $task
14+
* @param string $started
1515
*/
1616
public function __construct(Task $task, $started, $output)
1717
{

src/Events/TaskEvent.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class TaskEvent extends Event
1818
/**
1919
* Constructor.
2020
*
21-
* @param Task $task
21+
* @param Task $task
2222
*/
2323
public function __construct(Task $task)
2424
{

src/Events/Updating.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ class Updating extends BroadcastingEvent
1616
/**
1717
* Create a new event instance.
1818
*
19-
* @param array $input
20-
* @param Task $task
19+
* @param array $input
20+
* @param Task $task
2121
*/
2222
public function __construct(array $input, Task $task)
2323
{

src/Http/Controllers/ActiveTasksController.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class ActiveTasksController extends Controller
1313
private $tasks;
1414

1515
/**
16-
* @param TaskInterface $tasks
16+
* @param TaskInterface $tasks
1717
*/
1818
public function __construct(TaskInterface $tasks)
1919
{

src/Http/Controllers/ExecuteTasksController.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class ExecuteTasksController extends Controller
1313
private $tasks;
1414

1515
/**
16-
* @param TaskInterface $tasks
16+
* @param TaskInterface $tasks
1717
*/
1818
public function __construct(TaskInterface $tasks)
1919
{

src/Http/Controllers/ExportTasksController.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ class ExportTasksController extends Controller
1313

1414
/**
1515
* ExportTasksController constructor.
16-
* @param TaskInterface $tasks
16+
*
17+
* @param TaskInterface $tasks
1718
*/
1819
public function __construct(TaskInterface $tasks)
1920
{

src/Http/Controllers/ImportTasksController.php

+5-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ class ImportTasksController extends Controller
1414

1515
/**
1616
* ImportTasksController constructor.
17-
* @param TaskInterface $tasks
17+
*
18+
* @param TaskInterface $tasks
1819
*/
1920
public function __construct(TaskInterface $tasks)
2021
{
@@ -25,7 +26,9 @@ public function __construct(TaskInterface $tasks)
2526

2627
/**
2728
* Import tasks from a json file.
28-
* @param \Studio\Totem\Http\Requests\ImportRequest $request
29+
*
30+
* @param \Studio\Totem\Http\Requests\ImportRequest $request
31+
*
2932
* @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
3033
*/
3134
public function index(ImportRequest $request)

src/Http/Requests/ImportRequest.php

+3-1
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ public function messages()
5151
*
5252
* @param array|mixed $keys
5353
* @return array
54+
*
5455
* @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
5556
*/
5657
public function all($keys = null)
@@ -68,6 +69,7 @@ public function all($keys = null)
6869
* Get the validated data from the request.
6970
*
7071
* @return array
72+
*
7173
* @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
7274
*/
7375
public function validated()
@@ -84,7 +86,7 @@ public function validated()
8486
/**
8587
* * Handle a failed validation attempt.
8688
*
87-
* @param Validator $validator
89+
* @param Validator $validator
8890
*/
8991
protected function failedValidation(Validator $validator)
9092
{

src/Listeners/BuildCache.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public function handle(Event $event)
1919
/**
2020
* Rebuild Cache.
2121
*
22-
* @param Event $event
22+
* @param Event $event
2323
*/
2424
protected function build(Event $event)
2525
{

src/Listeners/BustCache.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public function handle(Event $event)
1919
/**
2020
* Clear Cache.
2121
*
22-
* @param Event $event
22+
* @param Event $event
2323
*/
2424
protected function clear(Event $event)
2525
{

src/Listeners/BustCacheImmediately.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class BustCacheImmediately
1515
/**
1616
* Create the event listener.
1717
*
18-
* @param Container $app
18+
* @param Container $app
1919
*/
2020
public function __construct(Container $app)
2121
{
@@ -35,7 +35,7 @@ public function handle(Event $event)
3535
/**
3636
* Clear Cache.
3737
*
38-
* @param Event $event
38+
* @param Event $event
3939
*/
4040
protected function clear(Event $event)
4141
{

src/Listeners/Listener.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ class Listener implements ShouldQueue
2121
/**
2222
* Create the event listener.
2323
*
24-
* @param Container $app
25-
* @param TaskInterface $tasks
24+
* @param Container $app
25+
* @param TaskInterface $tasks
2626
*/
2727
public function __construct(Container $app, TaskInterface $tasks)
2828
{

src/Repositories/EloquentTaskRepository.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public function builder(): Builder
4444
/**
4545
* Find a task by id.
4646
*
47-
* @param int|Task $id
47+
* @param int|Task $id
4848
* @return int|Task
4949
*/
5050
public function find($id)
@@ -87,7 +87,7 @@ public function findAllActive()
8787
/**
8888
* Create a new task.
8989
*
90-
* @param array $input
90+
* @param array $input
9191
* @return bool|Task
9292
*/
9393
public function store(array $input)
@@ -108,8 +108,8 @@ public function store(array $input)
108108
/**
109109
* Update the given task.
110110
*
111-
* @param array $input
112-
* @param Task $task
111+
* @param array $input
112+
* @param Task $task
113113
* @return bool|int|Task
114114
*/
115115
public function update(array $input, $task)
@@ -130,7 +130,7 @@ public function update(array $input, $task)
130130
/**
131131
* Delete the given task.
132132
*
133-
* @param int|Task $id
133+
* @param int|Task $id
134134
* @return bool
135135
*/
136136
public function destroy($id)

src/Task.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ public function autoCleanup()
208208
Result::query()
209209
->whereIn('id', $rowsToDelete)
210210
->delete();
211-
} while ($rowsToDelete > 0);
211+
} while ($rowsToDelete->count() > 0);
212212
} else {
213213
do {
214214
$rowsToDelete = $this->results()
@@ -221,7 +221,7 @@ public function autoCleanup()
221221
Result::query()
222222
->whereIn('id', $rowsToDelete)
223223
->delete();
224-
} while ($rowsToDelete > 0);
224+
} while ($rowsToDelete->count() > 0);
225225
}
226226
}
227227
}

src/Totem.php

-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ class Totem
2222
* Determine if the given request can access the Totem dashboard.
2323
*
2424
* @param \Illuminate\Http\Request $request
25-
*
2625
* @return bool
2726
*/
2827
public static function check($request)
@@ -36,7 +35,6 @@ public static function check($request)
3635
* Set the callback that should be used to authenticate Totem users.
3736
*
3837
* @param \Closure $callback
39-
*
4038
* @return static
4139
*/
4240
public static function auth(Closure $callback)

src/Traits/FrontendSortable.php

+3-4
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,9 @@
77
trait FrontendSortable
88
{
99
/**
10-
* @param \Illuminate\Database\Eloquent\Builder $builder
11-
* @param array $sortableColumns
12-
* @param array $defaultSort
13-
*
10+
* @param \Illuminate\Database\Eloquent\Builder $builder
11+
* @param array $sortableColumns
12+
* @param array $defaultSort
1413
* @return \Illuminate\Database\Eloquent\Builder
1514
*/
1615
public function scopeSortableBy(Builder $builder, array $sortableColumns, array $defaultSort = ['name' => 'asc']): Builder

tests/Feature/ViewDashboardTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ public function view_dashboard_multiple_tasks_with_multiple_results()
8080
}
8181

8282
/**
83-
* @param int $task_count
84-
* @param int $result_count
83+
* @param int $task_count
84+
* @param int $result_count
8585
* @return mixed
8686
*/
8787
private function _get_task_with_results($task_count = 1, $result_count = 1)

0 commit comments

Comments
 (0)