Skip to content

Commit

Permalink
Laravel 5.4 upgrade to 5.5
Browse files Browse the repository at this point in the history
  • Loading branch information
jcc committed Aug 30, 2017
1 parent 54203b1 commit ca50482
Show file tree
Hide file tree
Showing 4 changed files with 960 additions and 645 deletions.
4 changes: 1 addition & 3 deletions app/Console/Commands/BlogInstall.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ class BlogInstall extends Command

/**
* Create a new command instance.
*
* @return void
*/
public function __construct()
{
Expand All @@ -45,7 +43,7 @@ public function handle()

/**
* Exec sheel with pretty print.
*
*
* @param string $command
* @return mixed
*/
Expand Down
2 changes: 0 additions & 2 deletions app/Console/Commands/CreateAdmin.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@ class CreateAdmin extends Command

/**
* Create a new command instance.
*
* @return void
*/
public function __construct()
{
Expand Down
31 changes: 18 additions & 13 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,15 @@
"license": "MIT",
"type": "project",
"require": {
"php": ">=5.6.4",
"php": ">=7.0.0",
"fideloper/proxy": "~3.3",
"dflydev/apache-mime-types": "^1.0",
"erusev/parsedown": "^1.6",
"intervention/image": "^2.3",
"jcc/laravel-vote": "dev-master",
"jellybool/flysystem-upyun": "dev-master",
"jellybool/translug": "~2.0",
"laravel/framework": "5.4.*",
"laravel/framework": "5.5.*",
"laravel/passport": "^2.0",
"laravel/socialite": "^3.0",
"laravel/tinker": "~1.0",
Expand All @@ -22,9 +23,10 @@
"yzalis/identicon": "^1.1"
},
"require-dev": {
"filp/whoops": "~2.0",
"fzaninotto/faker": "~1.4",
"mockery/mockery": "0.9.*",
"phpunit/phpunit": "~5.0"
"phpunit/phpunit": "~6.0"
},
"autoload": {
"classmap": [
Expand All @@ -42,25 +44,28 @@
"Tests\\": "tests/"
}
},
"extra": {
"laravel": {
"dont-discover": [
]
}
},
"scripts": {
"post-root-package-install": [
"php -r \"file_exists('.env') || copy('.env.example', '.env');\""
"@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
],
"post-create-project-cmd": [
"php artisan key:generate"
],
"post-install-cmd": [
"Illuminate\\Foundation\\ComposerScripts::postInstall",
"php artisan optimize"
"@php artisan key:generate"
],
"post-update-cmd": [
"Illuminate\\Foundation\\ComposerScripts::postUpdate",
"php artisan optimize"
"post-autoload-dump": [
"Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
"@php artisan package:discover"
]
},
"config": {
"preferred-install": "dist",
"sort-packages": true
"sort-packages": true,
"optimize-autoloader": true
},
"minimum-stability": "dev",
"prefer-stable": true
Expand Down
Loading

0 comments on commit ca50482

Please sign in to comment.