Skip to content

Commit 38699d5

Browse files
authored
Merge pull request Braunson#11 from dicarlosystems/master
Updated to Laravel 5.5
2 parents 4f33233 + 43ebd97 commit 38699d5

File tree

6 files changed

+371
-367
lines changed

6 files changed

+371
-367
lines changed

app/Console/Kernel.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class Kernel extends ConsoleKernel
1313
* @var array
1414
*/
1515
protected $commands = [
16-
//
16+
1717
];
1818

1919
/**
@@ -36,5 +36,6 @@ protected function schedule(Schedule $schedule)
3636
protected function commands()
3737
{
3838
require base_path('routes/console.php');
39+
$this->load(__DIR__.'/Commands');
3940
}
4041
}

composer.json

+8-11
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,16 @@
88
"license": "MIT",
99
"type": "project",
1010
"require": {
11-
"php": ">=5.6.4",
12-
"laravel/framework": "5.4.*",
11+
"php": ">=7.0.0",
12+
"laravel/framework": "5.5.*",
1313
"laravel/tinker": "~1.0",
1414
"mrholek/CoreUI-Free-Bootstrap-Admin-Template": "dev-24d9a64"
1515
},
1616
"require-dev": {
1717
"fzaninotto/faker": "~1.4",
1818
"mockery/mockery": "0.9.*",
19-
"phpunit/phpunit": "^6.3.0"
19+
"phpunit/phpunit": "~6.0",
20+
"filp/whoops": "~2.0"
2021
},
2122
"repositories": [
2223
{
@@ -53,14 +54,10 @@
5354
"post-create-project-cmd": [
5455
"php artisan key:generate"
5556
],
56-
"post-install-cmd": [
57-
"Illuminate\\Foundation\\ComposerScripts::postInstall",
58-
"php artisan optimize"
59-
],
60-
"post-update-cmd": [
61-
"Illuminate\\Foundation\\ComposerScripts::postUpdate",
62-
"php artisan optimize"
63-
]
57+
"post-autoload-dump": [
58+
"Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
59+
"@php artisan package:discover"
60+
]
6461
},
6562
"config": {
6663
"preferred-install": "dist",

public/css/app.css

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/images/logo.png

5 Bytes
Loading

0 commit comments

Comments
 (0)