Skip to content

Commit 27944f6

Browse files
committed
upgrade to Laravel 5.6
1 parent 5ac46cd commit 27944f6

File tree

5 files changed

+480
-406
lines changed

5 files changed

+480
-406
lines changed

composer.json

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,26 @@
55
"license": "MIT",
66
"type": "project",
77
"require": {
8-
"php": ">=7.0.0",
8+
"php": ">=7.1.3",
99
"andreasindal/laravel-markdown": "^1.1",
10-
"barryvdh/laravel-debugbar": "^2.3",
1110
"barryvdh/laravel-dompdf": "^0.8.1",
1211
"brotzka/laravel-dotenv-editor": "^2.0",
1312
"guzzlehttp/guzzle": "^6.3",
1413
"intervention/image": "^2.3",
15-
"laravel/framework": "5.5.*",
14+
"laravel/framework": "5.6.*",
1615
"laravel/tinker": "~1.0",
1716
"maatwebsite/excel": "~2.1.0",
18-
"vinkla/hashids": "^3.2",
17+
"vinkla/hashids": "^4.0",
1918
"yajra/laravel-datatables-oracle": "8.*",
20-
"zizaco/entrust": "5.2.x-dev"
19+
"zizaco/entrust": "dev-master",
20+
"fideloper/proxy": "~4.0"
2121
},
2222
"require-dev": {
2323
"filp/whoops": "~2.0",
24+
"nunomaduro/collision": "~1.1",
2425
"fzaninotto/faker": "~1.4",
2526
"mockery/mockery": "~1.0",
26-
"phpunit/phpunit": "~6.0",
27+
"phpunit/phpunit": "~7.0",
2728
"symfony/thanks": "^1.0"
2829
},
2930
"autoload": {
@@ -62,5 +63,7 @@
6263
"preferred-install": "dist",
6364
"sort-packages": true,
6465
"optimize-autoloader": true
65-
}
66+
},
67+
"minimum-stability": "dev",
68+
"prefer-stable": true
6669
}

0 commit comments

Comments
 (0)