Skip to content

Commit 84d4aff

Browse files
committed
chore : split branches for L5.4 and 5.5
1 parent 2661dc4 commit 84d4aff

File tree

3 files changed

+16
-62
lines changed

3 files changed

+16
-62
lines changed

composer.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
}
1717
],
1818
"require": {
19-
"php": ">=5.6.4",
20-
"illuminate/bus":"~5.4",
21-
"illuminate/console": "~5.4",
22-
"illuminate/contracts": "~5.4",
23-
"illuminate/database":"~5.4",
24-
"illuminate/events": "~5.4",
25-
"illuminate/notifications": "~5.4"
19+
"php": ">=7.0",
20+
"illuminate/bus":"~5.5.0",
21+
"illuminate/console": "~5.5.0",
22+
"illuminate/contracts": "~5.5.0",
23+
"illuminate/database":"~5.5.0",
24+
"illuminate/events": "~5.5.0",
25+
"illuminate/notifications": "~5.5.0"
2626
},
2727
"require-dev": {
2828
"mockery/mockery": "~0.9",

src/Console/Kernel.php

Lines changed: 0 additions & 43 deletions
This file was deleted.

src/Http/Controllers/TasksController.php

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
use Studio\Totem\Task;
66
use Studio\Totem\Totem;
7-
use Studio\Totem\Console\Kernel;
7+
use Illuminate\Support\Facades\Artisan;
88
use Studio\Totem\Contracts\TaskInterface;
99
use Studio\Totem\Http\Requests\TaskRequest;
1010

@@ -15,23 +15,16 @@ class TasksController extends Controller
1515
*/
1616
private $tasks;
1717

18-
/**
19-
* @var Kernel
20-
*/
21-
private $kernel;
22-
2318
/**
2419
* TasksController constructor.
2520
*
2621
* @param TaskInterface $tasks
27-
* @param Kernel $kernel
2822
*/
29-
public function __construct(TaskInterface $tasks, Kernel $kernel)
23+
public function __construct(TaskInterface $tasks)
3024
{
3125
parent::__construct();
32-
$this->tasks = $tasks;
3326

34-
$this->kernel = $kernel;
27+
$this->tasks = $tasks;
3528
}
3629

3730
/**
@@ -55,7 +48,9 @@ public function create()
5548
{
5649
return view('totem::tasks.form', [
5750
'task' => new Task,
58-
'commands' => $this->kernel->all(),
51+
'commands' => collect(Artisan::all())->sortBy(function ($command) {
52+
return $command->getDescription();
53+
}),
5954
'timezones' => timezone_identifiers_list(),
6055
'frequencies' => Totem::frequencies(),
6156
]);
@@ -99,7 +94,9 @@ public function edit($task)
9994
{
10095
return view('totem::tasks.form', [
10196
'task' => $task,
102-
'commands' => $this->kernel->all(),
97+
'commands' => collect(Artisan::all())->sortBy(function ($command) {
98+
return $command->getDescription();
99+
}),
103100
'timezones' => timezone_identifiers_list(),
104101
'frequencies' => Totem::frequencies(),
105102
]);

0 commit comments

Comments
 (0)