Skip to content

Commit ff4551b

Browse files
authored
Updated dependencies for laravel 5.6 (#79)
* Updated dependencies for laravel 5.6
1 parent bc56171 commit ff4551b

File tree

3 files changed

+29
-15
lines changed

3 files changed

+29
-15
lines changed

composer.json

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,20 @@
1616
}
1717
],
1818
"require": {
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",
26-
"laravelcollective/html": "^5.5"
19+
"php": ">=7.1",
20+
"illuminate/bus": "~5.6.0",
21+
"illuminate/console": "~5.6.0",
22+
"illuminate/contracts": "~5.6.0",
23+
"illuminate/database": "~5.6.0",
24+
"illuminate/events": "~5.6.0",
25+
"illuminate/notifications": "~5.6.0",
26+
"laravelcollective/html": "~5.6"
2727
},
2828
"require-dev": {
29-
"mockery/mockery": "~1.0",
30-
"orchestra/database": "~3.0",
31-
"orchestra/testbench" : "~3.0",
32-
"phpunit/phpunit": "~6.0"
29+
"mockery/mockery": "^1.0",
30+
"orchestra/database": "^3.0",
31+
"orchestra/testbench" : "^3.6",
32+
"phpunit/phpunit": ">=6.0"
3333
},
3434
"suggest": {
3535
"nexmo/client": "Required for sms notifications."
@@ -43,7 +43,7 @@
4343
"extra": {
4444
"component": "package",
4545
"branch-alias": {
46-
"dev-2.0": "2.0.x-dev"
46+
"dev-3.0": "3.0.x-dev"
4747
},
4848
"laravel": {
4949
"providers": [

src/Traits/HasFrequencies.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public function frequencies()
9494
public function getCronExpression()
9595
{
9696
if (! $this->expression) {
97-
$this->expression = '* * * * * *';
97+
$this->expression = '* * * * *';
9898

9999
foreach ($this->frequencies as $frequency) {
100100
call_user_func_array([$this, $frequency->interval], $frequency->parameters->pluck('value')->toArray());

tests/TestCase.php

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@
55
use Exception;
66
use Studio\Totem\User;
77
use Studio\Totem\Totem;
8+
use Collective\Html\FormFacade;
9+
use Collective\Html\HtmlFacade;
810
use Illuminate\Support\Facades\Auth;
11+
use Collective\Html\HtmlServiceProvider;
912
use Orchestra\Testbench\Exceptions\Handler;
1013
use Illuminate\Contracts\Debug\ExceptionHandler;
1114
use Studio\Totem\Providers\TotemServiceProvider;
@@ -28,9 +31,11 @@ public function setUp()
2831
switch (app()->environment()) {
2932
case 'local':
3033
return true;
34+
3135
break;
3236
case 'testing':
3337
return Auth::check();
38+
3439
break;
3540
default:
3641
return false;
@@ -40,10 +45,19 @@ public function setUp()
4045
Totem::auth($auth);
4146
}
4247

48+
protected function getPackageAliases($app)
49+
{
50+
return [
51+
'Form' => FormFacade::class,
52+
'Html' => HtmlFacade::class,
53+
];
54+
}
55+
4356
protected function getPackageProviders($app)
4457
{
4558
return [
4659
TotemServiceProvider::class,
60+
HtmlServiceProvider::class,
4761
];
4862
}
4963

@@ -52,7 +66,7 @@ protected function getPackageProviders($app)
5266
*/
5367
protected function disableExceptionHandling()
5468
{
55-
$this->app->instance(ExceptionHandler::class, new class extends Handler {
69+
$this->app->instance(ExceptionHandler::class, new class() extends Handler {
5670
public function __construct()
5771
{
5872
}

0 commit comments

Comments
 (0)