Skip to content
This repository was archived by the owner on Feb 20, 2024. It is now read-only.

Commit 17e729f

Browse files
authored
Merge pull request #2 from cham11ng/migration
Migrate 5.4 to 5.6
2 parents 50557b8 + 9f9ae82 commit 17e729f

File tree

4 files changed

+1253
-568
lines changed

4 files changed

+1253
-568
lines changed

.env.example

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@ APP_NAME="SB Admin 2 | cham11ng"
22
APP_ENV=local
33
APP_KEY=
44
APP_DEBUG=true
5-
APP_LOG_LEVEL=debug
65
APP_URL=http://localhost
76

7+
LOG_CHANNEL=stack
8+
89
DB_CONNECTION=mysql
910
DB_HOST=127.0.0.1
1011
DB_PORT=3306
@@ -15,6 +16,7 @@ DB_PASSWORD=secret
1516
BROADCAST_DRIVER=log
1617
CACHE_DRIVER=file
1718
SESSION_DRIVER=file
19+
SESSION_LIFETIME=120
1820
QUEUE_DRIVER=sync
1921

2022
REDIS_HOST=127.0.0.1
@@ -31,3 +33,7 @@ MAIL_ENCRYPTION=null
3133
PUSHER_APP_ID=
3234
PUSHER_APP_KEY=
3335
PUSHER_APP_SECRET=
36+
PUSHER_APP_CLUSTER=mt1
37+
38+
MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
39+
MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"

app/Console/Kernel.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ protected function schedule(Schedule $schedule)
3535
*/
3636
protected function commands()
3737
{
38+
$this->load(__DIR__.'/Commands');
39+
3840
require base_path('routes/console.php');
3941
}
4042
}

composer.json

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,23 @@
55
"license": "MIT",
66
"type": "project",
77
"require": {
8-
"php": ">=5.6.4",
9-
"laravel/framework": "5.4.*",
8+
"php": ">=7.1.3",
9+
"fideloper/proxy": "~4.0",
10+
"laravel/framework": "5.6.*",
1011
"laravel/tinker": "~1.0"
1112
},
1213
"require-dev": {
14+
"filp/whoops": "~2.0",
1315
"fzaninotto/faker": "~1.4",
14-
"mockery/mockery": "0.9.*",
15-
"phpunit/phpunit": "~5.7"
16+
"mockery/mockery": "~1.0",
17+
"nunomaduro/collision": "~2.0",
18+
"phpunit/phpunit": "~7.0",
19+
"symfony/thanks": "^1.0"
1620
},
1721
"autoload": {
1822
"classmap": [
19-
"database"
23+
"database/seeds",
24+
"database/factories"
2025
],
2126
"psr-4": {
2227
"App\\": "app/"
@@ -27,25 +32,29 @@
2732
"Tests\\": "tests/"
2833
}
2934
},
35+
"extra": {
36+
"laravel": {
37+
"dont-discover": [
38+
]
39+
}
40+
},
3041
"scripts": {
3142
"post-root-package-install": [
32-
"php -r \"file_exists('.env') || copy('.env.example', '.env');\""
43+
"@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
3344
],
3445
"post-create-project-cmd": [
35-
"php artisan key:generate"
46+
"@php artisan key:generate"
3647
],
37-
"post-install-cmd": [
38-
"Illuminate\\Foundation\\ComposerScripts::postInstall",
39-
"php artisan optimize"
40-
],
41-
"post-update-cmd": [
42-
"Illuminate\\Foundation\\ComposerScripts::postUpdate",
43-
"php artisan optimize"
48+
"post-autoload-dump": [
49+
"Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
50+
"@php artisan package:discover"
4451
]
4552
},
4653
"config": {
4754
"preferred-install": "dist",
4855
"sort-packages": true,
4956
"optimize-autoloader": true
50-
}
57+
},
58+
"minimum-stability": "dev",
59+
"prefer-stable": true
5160
}

0 commit comments

Comments
 (0)