Skip to content

Commit

Permalink
框架升级到laravel 5.5
Browse files Browse the repository at this point in the history
  • Loading branch information
mylxsw committed Dec 2, 2017
1 parent 80c3d7e commit 1e4e9f9
Show file tree
Hide file tree
Showing 9 changed files with 1,278 additions and 471 deletions.
12 changes: 8 additions & 4 deletions app/Console/Kernel.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,16 @@ class Kernel extends ConsoleKernel
*
* @var array
*/
protected $commands = [
//
];
protected $commands
= [
//
];

/**
* Define the application's command schedule.
*
* @param \Illuminate\Console\Scheduling\Schedule $schedule
* @param \Illuminate\Console\Scheduling\Schedule $schedule
*
* @return void
*/
protected function schedule(Schedule $schedule)
Expand All @@ -35,6 +37,8 @@ protected function schedule(Schedule $schedule)
*/
protected function commands()
{
$this->load(__DIR__ . '/Commands');

require base_path('routes/console.php');
}
}
1 change: 1 addition & 0 deletions app/Http/Controllers/ShareController.php
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ public function page(Request $request, $hash)
* @param $page_id
*
* @return array
* @throws \Illuminate\Auth\Access\AuthorizationException
*/
public function create(Request $request, $project_id, $page_id)
{
Expand Down
10 changes: 8 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,18 @@
"barryvdh/laravel-ide-helper": "^2.3",
"erusev/parsedown": "^1.6",
"guzzlehttp/guzzle": "^6.3",
"laravel/framework": "5.4.*",
"laravel/framework": "5.5.*",
"laravel/tinker": "~1.0",
"lcobucci/jwt": "^3.2",
"mpdf/mpdf": "^7.0",
"sebastian/diff": "1.4.3"
},
"require-dev": {
"barryvdh/laravel-debugbar": "^3.1",
"filp/whoops": "~2.0",
"fzaninotto/faker": "~1.4",
"mockery/mockery": "0.9.*",
"phpunit/phpunit": "~5.7"
"phpunit/phpunit": "~6.0"
},
"autoload": {
"classmap": [
Expand Down Expand Up @@ -51,6 +53,10 @@
"post-update-cmd": [
"Illuminate\\Foundation\\ComposerScripts::postUpdate",
"php artisan optimize"
],
"post-autoload-dump": [
"Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
"@php artisan package:discover"
]
},
"config": {
Expand Down
Loading

0 comments on commit 1e4e9f9

Please sign in to comment.