Upgrade to Laravel 5.6 and PHP 7.1

This commit is contained in:
Phan An 2018-08-29 14:49:01 +07:00
parent 3825452658
commit e17c2e29d8
6 changed files with 504 additions and 1012 deletions

View file

@ -1,7 +1,6 @@
language: php language: php
php: php:
- 7.0
- 7.1 - 7.1
- 7.2 - 7.2

View file

@ -5,8 +5,8 @@
"license": "MIT", "license": "MIT",
"type": "project", "type": "project",
"require": { "require": {
"php": ">=5.6.4", "php": ">=7.1.3",
"laravel/framework": "5.5.*", "laravel/framework": "5.6.*",
"james-heinrich/getid3": "^1.9", "james-heinrich/getid3": "^1.9",
"guzzlehttp/guzzle": "^6.1", "guzzlehttp/guzzle": "^6.1",
"tymon/jwt-auth": "^0.5.6", "tymon/jwt-auth": "^0.5.6",
@ -18,20 +18,20 @@
"ext-exif": "*", "ext-exif": "*",
"ext-fileinfo": "*", "ext-fileinfo": "*",
"ext-json": "*", "ext-json": "*",
"ext-SimpleXML": "*" "ext-SimpleXML": "*",
"fideloper/proxy": "^4.0"
}, },
"require-dev": { "require-dev": {
"filp/whoops": "~2.0", "filp/whoops": "~2.0",
"fzaninotto/faker": "~1.4", "fzaninotto/faker": "~1.4",
"mockery/mockery": "~1.0", "mockery/mockery": "~1.0",
"phpunit/phpunit": "~6.0", "phpunit/phpunit": "~7.0",
"symfony/css-selector": "~3.1", "symfony/css-selector": "~3.1",
"symfony/dom-crawler": "^3.2", "symfony/dom-crawler": "^3.2",
"facebook/webdriver": "^1.2", "facebook/webdriver": "^1.2",
"barryvdh/laravel-ide-helper": "^2.1", "barryvdh/laravel-ide-helper": "^2.1",
"laravel/tinker": "^1.0", "laravel/tinker": "^1.0",
"laravel/browser-kit-testing": "^2.0", "laravel/browser-kit-testing": "^2.0",
"codeclimate/php-test-reporter": "^0.4.4",
"mikey179/vfsStream": "^1.6" "mikey179/vfsStream": "^1.6"
}, },
"autoload": { "autoload": {
@ -55,26 +55,24 @@
"@php artisan package:discover" "@php artisan package:discover"
], ],
"post-install-cmd": [ "post-install-cmd": [
"php artisan clear-compiled", "@php artisan clear-compiled",
"php artisan optimize", "@php artisan cache:clear",
"php artisan cache:clear", "@php -r \"if (!file_exists('.env')) copy('.env.example', '.env');\""
"php -r \"if (!file_exists('.env')) copy('.env.example', '.env');\""
], ],
"pre-update-cmd": [ "pre-update-cmd": [
"php artisan clear-compiled" "@php artisan clear-compiled"
], ],
"post-update-cmd": [ "post-update-cmd": [
"php artisan optimize", "@php artisan cache:clear"
"php artisan cache:clear"
], ],
"post-root-package-install": [ "post-root-package-install": [
"php -r \"copy('.env.example', '.env');\"" "@php -r \"copy('.env.example', '.env');\""
], ],
"post-create-project-cmd": [ "post-create-project-cmd": [
"php artisan key:generate" "@php artisan key:generate"
], ],
"test": [ "test": [
"phpunit --colors=always" "@phpunit --colors=always"
] ]
}, },
"config": { "config": {

1355
composer.lock generated

File diff suppressed because it is too large Load diff

View file

@ -85,21 +85,6 @@ return [
'cipher' => 'AES-256-CBC', 'cipher' => 'AES-256-CBC',
/*
|--------------------------------------------------------------------------
| Logging Configuration
|--------------------------------------------------------------------------
|
| Here you may configure the log settings for your application. Out of
| the box, Laravel uses the Monolog PHP logging library. This gives
| you a variety of powerful log handlers / formatters to utilize.
|
| Available Settings: "single", "daily", "syslog", "errorlog"
|
*/
'log' => env('APP_LOG', 'single'),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Autoloaded Service Providers | Autoloaded Service Providers

47
config/hashing.php Normal file
View file

@ -0,0 +1,47 @@
<?php
return [
/*
|--------------------------------------------------------------------------
| Default Hash Driver
|--------------------------------------------------------------------------
|
| This option controls the default hash driver that will be used to hash
| passwords for your application. By default, the bcrypt algorithm is
| used; however, you remain free to modify this option if you wish.
|
| Supported: "bcrypt", "argon"
|
*/
'driver' => 'bcrypt',
/*
|--------------------------------------------------------------------------
| Bcrypt Options
|--------------------------------------------------------------------------
|
| Here you may specify the configuration options that should be used when
| passwords are hashed using the Bcrypt algorithm. This will allow you
| to control the amount of time it takes to hash the given password.
|
*/
'bcrypt' => [
'rounds' => env('BCRYPT_ROUNDS', 10),
],
/*
|--------------------------------------------------------------------------
| Argon Options
|--------------------------------------------------------------------------
|
| Here you may specify the configuration options that should be used when
| passwords are hashed using the Argon algorithm. These will allow you
| to control the amount of time it takes to hash the given password.
|
*/
'argon' => [
'memory' => 1024,
'threads' => 2,
'time' => 2,
],
];

70
config/logging.php Normal file
View file

@ -0,0 +1,70 @@
<?php
use Monolog\Handler\StreamHandler;
return [
/*
|--------------------------------------------------------------------------
| Default Log Channel
|--------------------------------------------------------------------------
|
| This option defines the default log channel that gets used when writing
| messages to the logs. The name specified in this option should match
| one of the channels defined in the "channels" configuration array.
|
*/
'default' => env('LOG_CHANNEL', 'stack'),
/*
|--------------------------------------------------------------------------
| Log Channels
|--------------------------------------------------------------------------
|
| Here you may configure the log channels for your application. Out of
| the box, Laravel uses the Monolog PHP logging library. This gives
| you a variety of powerful log handlers / formatters to utilize.
|
| Available Drivers: "single", "daily", "slack", "syslog",
| "errorlog", "monolog",
| "custom", "stack"
|
*/
'channels' => [
'stack' => [
'driver' => 'stack',
'channels' => ['single'],
],
'single' => [
'driver' => 'single',
'path' => storage_path('logs/laravel.log'),
'level' => 'debug',
],
'daily' => [
'driver' => 'daily',
'path' => storage_path('logs/laravel.log'),
'level' => 'debug',
'days' => 7,
],
'slack' => [
'driver' => 'slack',
'url' => env('LOG_SLACK_WEBHOOK_URL'),
'username' => 'Laravel Log',
'emoji' => ':boom:',
'level' => 'critical',
],
'stderr' => [
'driver' => 'monolog',
'handler' => StreamHandler::class,
'with' => [
'stream' => 'php://stderr',
],
],
'syslog' => [
'driver' => 'syslog',
'level' => 'debug',
],
'errorlog' => [
'driver' => 'errorlog',
'level' => 'debug',
],
],
];