Skip to content

Commit d2a9d90

Browse files
committed
upgrade to Laravel 5.5
1 parent f52f535 commit d2a9d90

File tree

5 files changed

+718
-247
lines changed

5 files changed

+718
-247
lines changed

app/Console/Kernel.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ class Kernel extends ConsoleKernel
1919
/**
2020
* Define the application's command schedule.
2121
*
22-
* @param \Illuminate\Console\Scheduling\Schedule $schedule
23-
*
22+
* @param \Illuminate\Console\Scheduling\Schedule $schedule
2423
* @return void
2524
*/
2625
protected function schedule(Schedule $schedule)
@@ -30,12 +29,14 @@ protected function schedule(Schedule $schedule)
3029
}
3130

3231
/**
33-
* Register the Closure based commands for the application.
32+
* Register the commands for the application.
3433
*
3534
* @return void
3635
*/
3736
protected function commands()
3837
{
38+
$this->load(__DIR__.'/Commands');
39+
3940
require base_path('routes/console.php');
4041
}
4142
}

composer.json

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,28 +5,31 @@
55
"license": "MIT",
66
"type": "project",
77
"require": {
8-
"php": ">=5.6.4",
8+
"php": ">=7.0.0",
99
"andreasindal/laravel-markdown": "^1.1",
1010
"barryvdh/laravel-debugbar": "^2.3",
1111
"barryvdh/laravel-dompdf": "^0.8.1",
1212
"brotzka/laravel-dotenv-editor": "^2.0",
1313
"guzzlehttp/guzzle": "^6.3",
1414
"intervention/image": "^2.3",
15-
"laravel/framework": "5.4.*",
15+
"laravel/framework": "5.5.*",
1616
"laravel/tinker": "~1.0",
1717
"maatwebsite/excel": "~2.1.0",
1818
"vinkla/hashids": "^3.2",
1919
"yajra/laravel-datatables-oracle": "8.*",
2020
"zizaco/entrust": "5.2.x-dev"
2121
},
2222
"require-dev": {
23+
"filp/whoops": "~2.0",
2324
"fzaninotto/faker": "~1.4",
24-
"mockery/mockery": "0.9.*",
25-
"phpunit/phpunit": "~5.7"
25+
"mockery/mockery": "~1.0",
26+
"phpunit/phpunit": "~6.0",
27+
"symfony/thanks": "^1.0"
2628
},
2729
"autoload": {
2830
"classmap": [
29-
"database"
31+
"database/seeds",
32+
"database/factories"
3033
],
3134
"psr-4": {
3235
"App\\": "app/"
@@ -37,24 +40,27 @@
3740
"Tests\\": "tests/"
3841
}
3942
},
43+
"extra": {
44+
"laravel": {
45+
"dont-discover": [
46+
]
47+
}
48+
},
4049
"scripts": {
4150
"post-root-package-install": [
42-
"php -r \"file_exists('.env') || copy('.env.example', '.env');\""
51+
"@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
4352
],
4453
"post-create-project-cmd": [
45-
"php artisan key:generate"
46-
],
47-
"post-install-cmd": [
48-
"Illuminate\\Foundation\\ComposerScripts::postInstall",
49-
"php artisan optimize"
54+
"@php artisan key:generate"
5055
],
51-
"post-update-cmd": [
52-
"Illuminate\\Foundation\\ComposerScripts::postUpdate",
53-
"php artisan optimize"
56+
"post-autoload-dump": [
57+
"Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
58+
"@php artisan package:discover"
5459
]
5560
},
5661
"config": {
5762
"preferred-install": "dist",
58-
"sort-packages": true
63+
"sort-packages": true,
64+
"optimize-autoloader": true
5965
}
6066
}

0 commit comments

Comments
 (0)