Bumped to Laravel 5.8

This commit is contained in:
snipe 2019-11-18 21:17:36 -08:00
parent 5290c47e2a
commit 38ed73a2b4
3 changed files with 1230 additions and 980 deletions

View file

@ -1,11 +1,17 @@
{
"name": "snipe/snipe-it",
"description": "Open source asset management system built on Laravel.",
"keywords": ["assets", "asset-management", "laravel"],
"keywords": [
"assets",
"asset-management",
"it-tools",
"inventory",
"laravel"
],
"license": "AGPL-3.0-or-later",
"type": "project",
"require": {
"php": ">=7.1.3",
"php": "^7.1.3",
"ext-curl": "*",
"ext-fileinfo": "*",
"ext-json": "*",
@ -26,15 +32,15 @@
"guzzlehttp/guzzle": "^6.3",
"intervention/image": "^2.4",
"javiereguiluz/easyslugger": "^1.0",
"laravel/framework": "5.7.*",
"laravel/framework": "5.8.*",
"laravel/passport": "~6.0",
"laravel/tinker": "^1.0",
"laravelcollective/html": "^5.5",
"laravelcollective/html": "5.8.*",
"league/csv": "^9.2",
"league/flysystem-aws-s3-v3": "~1.0",
"league/flysystem-cached-adapter": "^1.0",
"league/flysystem-rackspace": "^1.0",
"league/flysystem-sftp": "~1.0",
"league/flysystem-sftp": "~1.0",
"maknz/slack": "^1.7",
"neitanod/forceutf8": "^2.0",
"paragonie/constant_time_encoding": "^1.0",
@ -50,16 +56,14 @@
"tecnickcom/tc-lib-barcode": "^1.15",
"tightenco/ziggy": "^0.7.1",
"unicodeveloper/laravel-password": "^1.0",
"watson/validating": "3.1.7"
"watson/validating": "^3.3"
},
"require-dev": {
"codeception/codeception": "^2.4",
"fzaninotto/faker": "~1.4",
"phpunit/php-token-stream": "1.4.11",
"phpunit/phpunit": "~6.0",
"squizlabs/php_codesniffer": "*",
"symfony/css-selector": "4.0.*",
"symfony/dom-crawler": "4.0.*"
"require-dev": {
"codeception/codeception": "^3.1",
"fzaninotto/faker": "^1.9",
"phpunit/phpunit": "^7.5",
"squizlabs/php_codesniffer": "^3.5",
"symfony/dom-crawler": "^4.3"
},
"suggest": {
"ext-mcrypt": "For upgrading from before v5.1 this is used to re-encrypt data"
@ -101,10 +105,9 @@
"preferred-install": "dist",
"sort-packages": true,
"optimize-autoloader": true,
"process-timeout":3000,
"process-timeout": 3000,
"platform": {
"php": "7.1.3"
}
}
}

2173
composer.lock generated

File diff suppressed because it is too large Load diff

View file

@ -393,7 +393,7 @@ return [
'Html' => Collective\Html\HtmlFacade::class,
'Google2FA' => PragmaRX\Google2FALaravel\Facade::class,
// 'Debugbar' => Barryvdh\Debugbar\Facade::class, //autodiscover should handle this
'Image' => Intervention\Image\ImageManagerStatic::class,
'Image' => Intervention\Image\ImageServiceProvider::class,
'Carbon' => Carbon\Carbon::class,