Skip to content

Commit 6917ea0

Browse files
ssddanbrownssddanbrown
committed
Upgraded app to Laravel 5.7
1 parent 213e9d2 commit 6917ea0

File tree

179 files changed

+825
-111
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

179 files changed

+825
-111
lines changed

‎.env.example.complete‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ REDIS_SERVERS=127.0.0.1:6379:0
8989
# Queue driver to use
9090
# Queue not really currently used but may be configurable in the future.
9191
# Would advise not to change this for now.
92-
QUEUE_DRIVER=sync
92+
QUEUE_CONNECTION=sync
9393

9494
# Storage system to use
9595
# Can be 'local', 'local_secure' or 's3'

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,5 @@ nbproject
2121
.buildpath
2222
.project
2323
.settings/
24-
webpack-stats.json
24+
webpack-stats.json
25+
.phpunit.result.cache

‎app/Application.php‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,12 @@ class Application extends \Illuminate\Foundation\Application
1313
*/
1414
public function configPath($path = '')
1515
{
16-
return $this->basePath.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'Config'.($path ? DIRECTORY_SEPARATOR.$path : $path);
16+
return $this->basePath
17+
. DIRECTORY_SEPARATOR
18+
. 'app'
19+
. DIRECTORY_SEPARATOR
20+
. 'Config'
21+
. ($path ? DIRECTORY_SEPARATOR.$path : $path);
1722
}
1823

1924
}

‎app/Config/app.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,9 @@
5757
// Application Fallback Locale
5858
'fallback_locale' => 'en',
5959

60+
// Faker Locale
61+
'faker_locale' => 'en_GB',
62+
6063
// Enable right-to-left text control.
6164
'rtl' => false,
6265

‎app/Config/cache.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,6 @@
6262

6363
// Cache key prefix
6464
// Used to prevent collisions in shared cache systems.
65-
'prefix' => env('CACHE_PREFIX', 'bookstack'),
65+
'prefix' => env('CACHE_PREFIX', 'bookstack_cache'),
6666

6767
];

‎app/Config/database.php‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
$redisDefaults = ['host' => '127.0.0.1', 'port' => '6379', 'database' => '0', 'password' => null];
1616
$redisServers = explode(',', trim(env('REDIS_SERVERS', '127.0.0.1:6379:0'), ','));
17-
$redisConfig = [];
17+
$redisConfig = ['client' => 'predis'];
1818
$cluster = count($redisServers) > 1;
1919

2020
if ($cluster) {
@@ -76,6 +76,7 @@
7676
'charset' => 'utf8mb4',
7777
'collation' => 'utf8mb4_unicode_ci',
7878
'prefix' => '',
79+
'prefix_indexes' => true,
7980
'strict' => false,
8081
'engine' => null,
8182
],
@@ -86,9 +87,10 @@
8687
'database' => 'bookstack-test',
8788
'username' => env('MYSQL_USER', 'bookstack-test'),
8889
'password' => env('MYSQL_PASSWORD', 'bookstack-test'),
89-
'charset' => 'utf8',
90-
'collation' => 'utf8_unicode_ci',
90+
'charset' => 'utf8mb4',
91+
'collation' => 'utf8mb4_unicode_ci',
9192
'prefix' => '',
93+
'prefix_indexes' => true,
9294
'strict' => false,
9395
],
9496

‎app/Config/hashing.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@
1212

1313
// Default Hash Driver
1414
// This option controls the default hash driver that will be used to hash
15-
// passwords for your application. By default, the bcrypt algorithm is
16-
// used; however, you remain free to modify this option if you wish.
17-
// Supported: "bcrypt", "argon"
15+
// passwords for your application. By default, the bcrypt algorithm is used.
16+
// Supported: "bcrypt", "argon", "argon2id"
1817
'driver' => 'bcrypt',
1918

2019
// Bcrypt Options

‎app/Config/logging.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,15 @@
2828
'channels' => [
2929
'stack' => [
3030
'driver' => 'stack',
31-
'channels' => ['single'],
31+
'channels' => ['daily'],
32+
'ignore_exceptions' => false,
3233
],
3334

3435
'single' => [
3536
'driver' => 'single',
3637
'path' => storage_path('logs/laravel.log'),
3738
'level' => 'debug',
39+
'days' => 14,
3840
],
3941

4042
'daily' => [

‎app/Config/mail.php‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,10 @@
4646
],
4747
],
4848

49+
// Log Channel
50+
// If you are using the "log" driver, you may specify the logging channel
51+
// if you prefer to keep mail messages separate from other log entries
52+
// for simpler reading. Otherwise, the default channel will be used.
53+
'log_channel' => env('MAIL_LOG_CHANNEL'),
54+
4955
];

‎app/Config/queue.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
// Default driver to use for the queue
1414
// Options: null, sync, redis
15-
'default' => env('QUEUE_DRIVER', 'sync'),
15+
'default' => env('QUEUE_CONNECTION', 'sync'),
1616

1717
// Queue connection configuration
1818
'connections' => [

0 commit comments

Comments
 (0)