kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-30 02:26:58 +00:00
Code Issues Projects Releases Wiki Activity

Upgrade to Laravel 5.6 #1221

Browse Source
This commit is contained in:
James Cole
2018-03-07 20:37:00 +01:00
parent c76b634d0b
commit 0a056ad02d
6 changed files with 368 additions and 364 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/Http/Middleware/TrustProxies.php
View File

@@ -32,19 +32,9 @@ use Illuminate\Http\Request;
*/ */
class TrustProxies extends Middleware class TrustProxies extends Middleware
{ {
/** /** @var int */
* The current proxy header mappings. protected $headers = Request::HEADER_X_FORWARDED_ALL;
*
* @var array
*/
protected $headers
= [
Request::HEADER_FORWARDED => 'FORWARDED',
Request::HEADER_X_FORWARDED_FOR => 'X_FORWARDED_FOR',
Request::HEADER_X_FORWARDED_HOST => 'X_FORWARDED_HOST',
Request::HEADER_X_FORWARDED_PORT => 'X_FORWARDED_PORT',
Request::HEADER_X_FORWARDED_PROTO => 'X_FORWARDED_PROTO',
];
/** /**
* The trusted proxies for this application. * The trusted proxies for this application.
* *

62
bootstrap/app.php
View File

@@ -70,37 +70,37 @@ $app->singleton(
FireflyIII\Exceptions\Handler::class FireflyIII\Exceptions\Handler::class
); );
/* Overrule logging if not Sandstorm */ ///* Overrule logging if not Sandstorm */
if (!(env('IS_SANDSTORM') === true)) { //if (!(env('IS_SANDSTORM') === true)) {
$app->configureMonologUsing( // $app->configureMonologUsing(
function (Logger $monolog) use ($app) { // function (Logger $monolog) use ($app) {
//
$interface = php_sapi_name(); // $interface = php_sapi_name();
$path = $app->storagePath() . '/logs/ff3-' . $interface . '.log'; // $path = $app->storagePath() . '/logs/ff3-' . $interface . '.log';
$level = 'debug'; // $level = 'debug';
if ($app->bound('config')) { // if ($app->bound('config')) {
$level = $app->make('config')->get('app.log_level', 'debug'); // $level = $app->make('config')->get('app.log_level', 'debug');
} // }
$levels = [ // $levels = [
'debug' => Logger::DEBUG, // 'debug' => Logger::DEBUG,
'info' => Logger::INFO, // 'info' => Logger::INFO,
'notice' => Logger::NOTICE, // 'notice' => Logger::NOTICE,
'warning' => Logger::WARNING, // 'warning' => Logger::WARNING,
'error' => Logger::ERROR, // 'error' => Logger::ERROR,
'critical' => Logger::CRITICAL, // 'critical' => Logger::CRITICAL,
'alert' => Logger::ALERT, // 'alert' => Logger::ALERT,
'emergency' => Logger::EMERGENCY, // 'emergency' => Logger::EMERGENCY,
]; // ];
//
$useLevel = $levels[$level]; // $useLevel = $levels[$level];
//
$formatter = new LineFormatter(null, null, true, true); // $formatter = new LineFormatter(null, null, true, true);
$handler = new RotatingFileHandler($path, 5, $useLevel); // $handler = new RotatingFileHandler($path, 5, $useLevel);
$handler->setFormatter($formatter); // $handler->setFormatter($formatter);
$monolog->pushHandler($handler); // $monolog->pushHandler($handler);
} // }
); // );
} //}
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------

15
composer.json
View File

@@ -49,15 +49,14 @@
"ext-curl": "*", "ext-curl": "*",
"ext-gd": "*", "ext-gd": "*",
"ext-intl": "*", "ext-intl": "*",
"ext-mbstring": "*",
"ext-zip": "*", "ext-zip": "*",
"bacon/bacon-qr-code": "1.*", "bacon/bacon-qr-code": "1.*",
"davejamesmiller/laravel-breadcrumbs": "4.*", "davejamesmiller/laravel-breadcrumbs": "5.*",
"doctrine/dbal": "2.*", "doctrine/dbal": "2.*",
"fideloper/proxy": "3.*", "fideloper/proxy": "4.*",
"laravel/framework": "5.5.*", "laravel/framework": "5.6.*",
"laravel/passport": "^4.0", "laravel/passport": "^5.0",
"laravelcollective/html": "5.5.*", "laravelcollective/html": "5.6.*",
"league/commonmark": "0.*", "league/commonmark": "0.*",
"league/csv": "9.*", "league/csv": "9.*",
"league/fractal": "^0.17.0", "league/fractal": "^0.17.0",
@@ -75,7 +74,7 @@
"fzaninotto/faker": "1.*", "fzaninotto/faker": "1.*",
"mockery/mockery": "^1.0", "mockery/mockery": "^1.0",
"php-coveralls/php-coveralls": "^2.0", "php-coveralls/php-coveralls": "^2.0",
"phpunit/phpunit": "~6.0" "phpunit/phpunit": "~7.0"
}, },
"autoload": { "autoload": {
"classmap": [ "classmap": [
@@ -113,11 +112,9 @@
"php artisan firefly:upgrade-database", "php artisan firefly:upgrade-database",
"php artisan firefly:verify", "php artisan firefly:verify",
"php artisan firefly:instructions update", "php artisan firefly:instructions update",
"php artisan optimize",
"php artisan passport:install" "php artisan passport:install"
], ],
"post-install-cmd": [ "post-install-cmd": [
"php artisan optimize",
"php artisan firefly:instructions install" "php artisan firefly:instructions install"
] ]
}, },

618
composer.lock generated
View File

File diff suppressed because it is too large Load Diff

1
config/firefly.php
View File

@@ -35,6 +35,7 @@ return [
'encryption' => (is_null(env('USE_ENCRYPTION')) || env('USE_ENCRYPTION') === true), 'encryption' => (is_null(env('USE_ENCRYPTION')) || env('USE_ENCRYPTION') === true),
'version' => '4.7.1.4', 'version' => '4.7.1.4',
'api_version' => '0.1', 'api_version' => '0.1',
'db_version' => 2,
'maxUploadSize' => 15242880, 'maxUploadSize' => 15242880,
'allowedMimes' => [ 'allowedMimes' => [
/* plain files */ /* plain files */

20
config/hashing.php Normal file
View File

@@ -0,0 +1,20 @@
<?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',
];