Skip to content

Commit fdc8a7a

Browse files
bennothommobennothommo
authored
Synchronise config files with Laravel 6 (#179)
1 parent 801c323 commit fdc8a7a

10 files changed

+172
-108
lines changed

‎config/broadcasting.php

+13-6
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
| framework when an event needs to be broadcast. You may set this to
1212
| any of the connections defined in the "connections" array below.
1313
|
14+
| Supported: "pusher", "redis", "log", "null"
15+
|
1416
*/
1517

1618
'default' => 'pusher',
@@ -29,24 +31,29 @@
2931
'connections' => [
3032

3133
'pusher' => [
32-
'driver' => 'pusher',
33-
'key' => '',
34-
'secret' => '',
35-
'app_id' => '',
34+
'driver' => 'pusher',
35+
'key' => '',
36+
'secret' => '',
37+
'app_id' => '',
3638
'options' => [
37-
//
39+
'cluster' => '',
40+
'useTLS' => true,
3841
],
3942
],
4043

4144
'redis' => [
42-
'driver' => 'redis',
45+
'driver' => 'redis',
4346
'connection' => 'default',
4447
],
4548

4649
'log' => [
4750
'driver' => 'log',
4851
],
4952

53+
'null' => [
54+
'driver' => 'null',
55+
],
56+
5057
],
5158

5259
];

‎config/cache.php

+22-1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@
2929
| well as their drivers. You may even define multiple stores for the
3030
| same cache driver to group types of items stored in your caches.
3131
|
32+
| Supported: "apc", "array", "database", "file",
33+
| "memcached", "redis", "dynamodb"
34+
|
3235
*/
3336

3437
'stores' => [
@@ -53,7 +56,15 @@
5356
],
5457

5558
'memcached' => [
56-
'driver' => 'memcached',
59+
'driver' => 'memcached',
60+
'persistent_id' => null,
61+
'sasl' => [
62+
// env('MEMCACHED_USERNAME'),
63+
// env('MEMCACHED_PASSWORD'),
64+
],
65+
'options' => [
66+
// Memcached::OPT_CONNECT_TIMEOUT => 2000,
67+
],
5768
'servers' => [
5869
[
5970
'host' => '127.0.0.1',
@@ -68,6 +79,15 @@
6879
'connection' => 'default',
6980
],
7081

82+
'dynamodb' => [
83+
'driver' => 'dynamodb',
84+
'key' => '',
85+
'secret' => '',
86+
'region' => 'us-east-1',
87+
'table' => 'cache',
88+
'endpoint' => '',
89+
],
90+
7191
],
7292

7393
/*
@@ -118,4 +138,5 @@
118138
*/
119139

120140
'disableRequestCache' => null,
141+
121142
];

‎config/database.php

+50-35
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,9 @@
3535
|
3636
| Here are each of the database connections setup for your application.
3737
| Of course, examples of configuring each database platform that is
38-
| supported by Laravel is shown below to make development simple.
38+
| supported by Winter CMS is shown below to make development simple.
3939
|
40-
|
41-
| All database work in Laravel is done through the PHP PDO facilities
40+
| All database work in Winter CMS is done through the PHP PDO facilities
4241
| so make sure you have the driver for your particular database of
4342
| choice installed on your machine before you begin development.
4443
|
@@ -47,45 +46,56 @@
4746
'connections' => [
4847

4948
'sqlite' => [
50-
'driver' => 'sqlite',
51-
'database' => base_path('storage/database.sqlite'),
52-
'prefix' => '',
49+
'driver' => 'sqlite',
50+
// 'url' => env('DATABASE_URL'),
51+
'database' => base_path('storage/database.sqlite'),
52+
'prefix' => '',
53+
'foreign_key_constraints' => true,
5354
],
5455

5556
'mysql' => [
56-
'driver' => 'mysql',
57-
'engine' => 'InnoDB',
58-
'host' => '127.0.0.1',
59-
'port' => 3306,
60-
'database' => 'database',
61-
'username' => 'root',
62-
'password' => '',
63-
'charset' => 'utf8mb4',
64-
'collation' => 'utf8mb4_unicode_ci',
65-
'prefix' => '',
66-
'varcharmax' => 191,
57+
'driver' => 'mysql',
58+
// 'url' => env('DATABASE_URL'),
59+
'engine' => 'InnoDB',
60+
'host' => '127.0.0.1',
61+
'port' => 3306,
62+
'database' => 'database',
63+
'username' => 'root',
64+
'password' => '',
65+
'charset' => 'utf8mb4',
66+
'collation' => 'utf8mb4_unicode_ci',
67+
'prefix' => '',
68+
'prefix_indexes' => true,
69+
'strict' => true,
70+
'varcharmax' => 191,
6771
],
6872

6973
'pgsql' => [
70-
'driver' => 'pgsql',
71-
'host' => '127.0.0.1',
72-
'port' => 5432,
73-
'database' => 'database',
74-
'username' => 'root',
75-
'password' => '',
76-
'charset' => 'utf8',
77-
'prefix' => '',
78-
'schema' => 'public',
74+
'driver' => 'pgsql',
75+
// 'url' => env('DATABASE_URL'),
76+
'host' => '127.0.0.1',
77+
'port' => 5432,
78+
'database' => 'database',
79+
'username' => 'root',
80+
'password' => '',
81+
'charset' => 'utf8',
82+
'prefix' => '',
83+
'prefix_indexes' => true,
84+
'schema' => 'public',
85+
'sslmode' => 'prefer',
7986
],
8087

8188
'sqlsrv' => [
82-
'driver' => 'sqlsrv',
83-
'host' => '127.0.0.1',
84-
'port' => 1433,
85-
'database' => 'database',
86-
'username' => 'root',
87-
'password' => '',
88-
'prefix' => '',
89+
'driver' => 'sqlsrv',
90+
// 'url' => env('DATABASE_URL'),
91+
'host' => '127.0.0.1',
92+
'port' => 1433,
93+
'database' => 'database',
94+
'username' => 'root',
95+
'password' => '',
96+
'charset' => 'utf8',
97+
'prefix' => '',
98+
'prefix_indexes' => true,
8999
],
90100

91101
],
@@ -110,16 +120,21 @@
110120
|
111121
| Redis is an open source, fast, and advanced key-value store that also
112122
| provides a richer set of commands than a typical key-value systems
113-
| such as APC or Memcached. Laravel makes it easy to dig right in.
123+
| such as APC or Memcached. Winter CMS makes it easy to dig right in.
114124
|
115125
*/
116126

117127
'redis' => [
118128

119129
'client' => 'predis',
120-
'cluster' => false,
130+
131+
'options' => [
132+
'cluster' => 'redis',
133+
'prefix' => '',
134+
],
121135

122136
'default' => [
137+
// 'url' => env('REDIS_URL'),
123138
'host' => '127.0.0.1',
124139
'password' => null,
125140
'port' => 6379,

‎config/filesystems.php

+11-10
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,8 @@
88
|--------------------------------------------------------------------------
99
|
1010
| Here you may specify the default filesystem disk that should be used
11-
| by the framework. A "local" driver, as well as a variety of cloud
12-
| based drivers are available for your choosing. Just store away!
13-
|
14-
| Supported: "local", "ftp", "sftp", "s3", "rackspace"
11+
| by the framework. The "local" disk, as well as a variety of cloud
12+
| based disks are available to your application. Just store away!
1513
|
1614
*/
1715

@@ -39,6 +37,8 @@
3937
| may even configure multiple disks of the same driver. Defaults have
4038
| been setup for each driver as an example of the required options.
4139
|
40+
| Supported Drivers: "local", "ftp", "sftp", "s3", "rackspace"
41+
|
4242
*/
4343

4444
'disks' => [
@@ -50,11 +50,13 @@
5050
],
5151

5252
's3' => [
53-
'driver' => 's3',
54-
'key' => 'your-key',
55-
'secret' => 'your-secret',
56-
'region' => 'your-region',
57-
'bucket' => 'your-bucket',
53+
'driver' => 's3',
54+
'key' => '',
55+
'secret' => '',
56+
'region' => '',
57+
'bucket' => '',
58+
// 'url' => env('AWS_URL'),
59+
// 'endpoint' => env('AWS_ENDPOINT'),
5860
],
5961

6062
'rackspace' => [
@@ -65,7 +67,6 @@
6567
'endpoint' => 'https://identity.api.rackspacecloud.com/v2.0/',
6668
'region' => 'IAD',
6769
],
68-
6970
],
7071

7172
];

‎config/hashing.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@
4444
*/
4545

4646
'argon' => [
47-
'memory' => 1024,
47+
'memory' => 1024,
4848
'threads' => 2,
49-
'time' => 2,
49+
'time' => 2,
5050
],
5151

5252
];

‎config/logging.php

+18-18
Original file line numberDiff line numberDiff line change
@@ -32,45 +32,45 @@
3232

3333
'channels' => [
3434
'stack' => [
35-
'driver' => 'stack',
36-
'channels' => ['daily'],
35+
'driver' => 'stack',
36+
'channels' => ['daily'],
3737
'ignore_exceptions' => false,
3838
],
3939

4040
'single' => [
4141
'driver' => 'single',
42-
'path' => storage_path('logs/system.log'),
43-
'level' => 'debug',
42+
'path' => storage_path('logs/system.log'),
43+
'level' => 'debug',
4444
],
4545

4646
'daily' => [
4747
'driver' => 'daily',
48-
'path' => storage_path('logs/system.log'),
49-
'level' => 'debug',
50-
'days' => 14,
48+
'path' => storage_path('logs/system.log'),
49+
'level' => 'debug',
50+
'days' => 14,
5151
],
5252

5353
'slack' => [
54-
'driver' => 'slack',
55-
'url' => env('LOG_SLACK_WEBHOOK_URL'),
54+
'driver' => 'slack',
55+
'url' => env('LOG_SLACK_WEBHOOK_URL'),
5656
'username' => 'Winter CMS Log',
57-
'emoji' => ':boom:',
58-
'level' => 'critical',
57+
'emoji' => ':boom:',
58+
'level' => 'critical',
5959
],
6060

6161
'papertrail' => [
62-
'driver' => 'monolog',
63-
'level' => 'debug',
64-
'handler' => \Monolog\Handler\SyslogUdpHandler::class,
62+
'driver' => 'monolog',
63+
'level' => 'debug',
64+
'handler' => \Monolog\Handler\SyslogUdpHandler::class,
6565
'handler_with' => [
6666
'host' => env('PAPERTRAIL_URL'),
6767
'port' => env('PAPERTRAIL_PORT'),
6868
],
6969
],
7070

7171
'stderr' => [
72-
'driver' => 'monolog',
73-
'handler' => \Monolog\Handler\StreamHandler::class,
72+
'driver' => 'monolog',
73+
'handler' => \Monolog\Handler\StreamHandler::class,
7474
'formatter' => env('LOG_STDERR_FORMATTER'),
7575
'with' => [
7676
'stream' => 'php://stderr',
@@ -79,12 +79,12 @@
7979

8080
'syslog' => [
8181
'driver' => 'syslog',
82-
'level' => 'debug',
82+
'level' => 'debug',
8383
],
8484

8585
'errorlog' => [
8686
'driver' => 'errorlog',
87-
'level' => 'debug',
87+
'level' => 'debug',
8888
],
8989
],
9090

‎config/mail.php

+13
Original file line numberDiff line numberDiff line change
@@ -112,4 +112,17 @@
112112

113113
'sendmail' => '/usr/sbin/sendmail -bs',
114114

115+
/*
116+
|--------------------------------------------------------------------------
117+
| Log Channel
118+
|--------------------------------------------------------------------------
119+
|
120+
| If you are using the "log" driver, you may specify the logging channel
121+
| if you prefer to keep mail messages separate from other log entries
122+
| for simpler reading. Otherwise, the default channel will be used.
123+
|
124+
*/
125+
126+
// 'log_channel' => env('MAIL_LOG_CHANNEL'),
127+
115128
];

0 commit comments

Comments
 (0)