Skip to content

Commit 87ab822

Browse files
jensdeniesjensdenies
authored
Merge pull request #1 from laravel/5.7
Merge Master
2 parents ad95377 + 26e830b commit 87ab822

18 files changed

+504
-89
lines changed

‎config/app.php

Lines changed: 74 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,68 @@
44

55
/*
66
|--------------------------------------------------------------------------
7-
| Encryption Key
7+
| Application Name
88
|--------------------------------------------------------------------------
99
|
10-
| This key is used by the Illuminate encrypter service and should be set
11-
| to a random, 32 character string, otherwise these encrypted strings
12-
| will not be safe. Please do this before deploying an application!
10+
| This value is the name of your application. This value is used when the
11+
| framework needs to place the application's name in a notification or
12+
| any other location as required by the application or its packages.
1313
|
1414
*/
1515

16-
'key' => env('APP_KEY', 'SomeRandomString!!!'),
16+
'name' => env('APP_NAME', 'Lumen'),
1717

18-
'cipher' => 'AES-256-CBC',
18+
/*
19+
|--------------------------------------------------------------------------
20+
| Application Environment
21+
|--------------------------------------------------------------------------
22+
|
23+
| This value determines the "environment" your application is currently
24+
| running in. This may determine how you prefer to configure various
25+
| services the application utilizes. Set this in your ".env" file.
26+
|
27+
*/
28+
29+
'env' => env('APP_ENV', 'production'),
30+
31+
/*
32+
|--------------------------------------------------------------------------
33+
| Application Debug Mode
34+
|--------------------------------------------------------------------------
35+
|
36+
| When your application is in debug mode, detailed error messages with
37+
| stack traces will be shown on every error that occurs within your
38+
| application. If disabled, a simple generic error page is shown.
39+
|
40+
*/
41+
42+
'debug' => env('APP_DEBUG', false),
43+
44+
/*
45+
|--------------------------------------------------------------------------
46+
| Application URL
47+
|--------------------------------------------------------------------------
48+
|
49+
| This URL is used by the console to properly generate URLs when using
50+
| the Artisan command line tool. You should set this to the root of
51+
| your application so that it is used when running Artisan tasks.
52+
|
53+
*/
54+
55+
'url' => env('APP_URL', 'http://localhost'),
56+
57+
/*
58+
|--------------------------------------------------------------------------
59+
| Application Timezone
60+
|--------------------------------------------------------------------------
61+
|
62+
| Here you may specify the default timezone for your application, which
63+
| will be used by the PHP date and date-time functions. We have gone
64+
| ahead and set this to a sensible default for you out of the box.
65+
|
66+
*/
67+
68+
'timezone' => 'UTC',
1969

2070
/*
2171
|--------------------------------------------------------------------------
@@ -27,7 +77,9 @@
2777
| to any of the locales which will be supported by the application.
2878
|
2979
*/
80+
3081
'locale' => env('APP_LOCALE', 'en'),
82+
3183
/*
3284
|--------------------------------------------------------------------------
3385
| Application Fallback Locale
@@ -38,6 +90,22 @@
3890
| the language folders that are provided through your application.
3991
|
4092
*/
93+
4194
'fallback_locale' => env('APP_FALLBACK_LOCALE', 'en'),
4295

96+
/*
97+
|--------------------------------------------------------------------------
98+
| Encryption Key
99+
|--------------------------------------------------------------------------
100+
|
101+
| This key is used by the Illuminate encrypter service and should be set
102+
| to a random, 32 character string, otherwise these encrypted strings
103+
| will not be safe. Please do this before deploying an application!
104+
|
105+
*/
106+
107+
'key' => env('APP_KEY'),
108+
109+
'cipher' => 'AES-256-CBC',
110+
43111
];

‎config/broadcasting.php

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,11 @@
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

16-
'default' => env('BROADCAST_DRIVER', 'pusher'),
18+
'default' => env('BROADCAST_DRIVER', 'null'),
1719

1820
/*
1921
|--------------------------------------------------------------------------
@@ -30,9 +32,13 @@
3032

3133
'pusher' => [
3234
'driver' => 'pusher',
33-
'key' => env('PUSHER_KEY'),
34-
'secret' => env('PUSHER_SECRET'),
35+
'key' => env('PUSHER_APP_KEY'),
36+
'secret' => env('PUSHER_APP_SECRET'),
3537
'app_id' => env('PUSHER_APP_ID'),
38+
'options' => [
39+
'cluster' => env('PUSHER_APP_CLUSTER'),
40+
'encrypted' => true,
41+
],
3642
],
3743

3844
'redis' => [
@@ -44,6 +50,10 @@
4450
'driver' => 'log',
4551
],
4652

53+
'null' => [
54+
'driver' => 'null',
55+
],
56+
4757
],
4858

4959
];

‎config/cache.php

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,11 @@
1111
| using this caching library. This connection is used when another is
1212
| not explicitly specified when executing a given caching function.
1313
|
14+
| Supported: "apc", "array", "database", "file", "memcached", "redis"
15+
|
1416
*/
1517

16-
'default' => env('CACHE_DRIVER', 'memcached'),
18+
'default' => env('CACHE_DRIVER', 'file'),
1719

1820
/*
1921
|--------------------------------------------------------------------------
@@ -38,20 +40,30 @@
3840

3941
'database' => [
4042
'driver' => 'database',
41-
'table' => env('CACHE_DATABASE_TABLE', 'cache'),
43+
'table' => env('CACHE_DATABASE_TABLE', 'cache'),
4244
'connection' => env('CACHE_DATABASE_CONNECTION', null),
4345
],
4446

4547
'file' => [
4648
'driver' => 'file',
47-
'path' => storage_path('framework/cache'),
49+
'path' => storage_path('framework/cache/data'),
4850
],
4951

5052
'memcached' => [
51-
'driver' => 'memcached',
53+
'driver' => 'memcached',
54+
'persistent_id' => env('MEMCACHED_PERSISTENT_ID'),
55+
'sasl' => [
56+
env('MEMCACHED_USERNAME'),
57+
env('MEMCACHED_PASSWORD'),
58+
],
59+
'options' => [
60+
// Memcached::OPT_CONNECT_TIMEOUT => 2000,
61+
],
5262
'servers' => [
5363
[
54-
'host' => env('MEMCACHED_HOST', '127.0.0.1'), 'port' => env('MEMCACHED_PORT', 11211), 'weight' => 100,
64+
'host' => env('MEMCACHED_HOST', '127.0.0.1'),
65+
'port' => env('MEMCACHED_PORT', 11211),
66+
'weight' => 100,
5567
],
5668
],
5769
],
@@ -74,6 +86,9 @@
7486
|
7587
*/
7688

77-
'prefix' => env('CACHE_PREFIX', 'laravel'),
89+
'prefix' => env(
90+
'CACHE_PREFIX',
91+
str_slug(env('APP_NAME', 'lumen'), '_').'_cache'
92+
),
7893

7994
];

‎config/database.php

Lines changed: 37 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,6 @@
22

33
return [
44

5-
/*
6-
|--------------------------------------------------------------------------
7-
| PDO Fetch Style
8-
|--------------------------------------------------------------------------
9-
|
10-
| By default, database results will be returned as instances of the PHP
11-
| stdClass object; however, you may desire to retrieve records in an
12-
| array format for simplicity. Here you can tweak the fetch style.
13-
|
14-
*/
15-
16-
'fetch' => PDO::FETCH_CLASS,
17-
185
/*
196
|--------------------------------------------------------------------------
207
| Default Database Connection Name
@@ -46,51 +33,50 @@
4633

4734
'connections' => [
4835

49-
'testing' => [
50-
'driver' => 'sqlite',
51-
'database' => ':memory:',
52-
],
53-
5436
'sqlite' => [
55-
'driver' => 'sqlite',
56-
'database' => env('DB_DATABASE', base_path('database/database.sqlite')),
57-
'prefix' => env('DB_PREFIX', ''),
37+
'driver' => 'sqlite',
38+
'database' => env('DB_DATABASE', database_path('database.sqlite')),
39+
'prefix' => env('DB_PREFIX', ''),
5840
],
5941

6042
'mysql' => [
61-
'driver' => 'mysql',
62-
'host' => env('DB_HOST', 'localhost'),
63-
'port' => env('DB_PORT', 3306),
64-
'database' => env('DB_DATABASE', 'forge'),
65-
'username' => env('DB_USERNAME', 'forge'),
66-
'password' => env('DB_PASSWORD', ''),
67-
'charset' => env('DB_CHARSET', 'utf8mb4'),
43+
'driver' => 'mysql',
44+
'host' => env('DB_HOST', '127.0.0.1'),
45+
'port' => env('DB_PORT', 3306),
46+
'database' => env('DB_DATABASE', 'forge'),
47+
'username' => env('DB_USERNAME', 'forge'),
48+
'password' => env('DB_PASSWORD', ''),
49+
'unix_socket' => env('DB_SOCKET', ''),
50+
'charset' => env('DB_CHARSET', 'utf8mb4'),
6851
'collation' => env('DB_COLLATION', 'utf8mb4_unicode_ci'),
69-
'prefix' => env('DB_PREFIX', ''),
70-
'timezone' => env('DB_TIMEZONE', '+00:00'),
71-
'strict' => env('DB_STRICT_MODE', false),
52+
'prefix' => env('DB_PREFIX', ''),
53+
'strict' => env('DB_STRICT_MODE', true),
54+
'engine' => env('DB_ENGINE', null),
55+
'timezone' => env('DB_TIMEZONE', '+00:00'),
7256
],
7357

7458
'pgsql' => [
75-
'driver' => 'pgsql',
76-
'host' => env('DB_HOST', 'localhost'),
77-
'port' => env('DB_PORT', 5432),
59+
'driver' => 'pgsql',
60+
'host' => env('DB_HOST', '127.0.0.1'),
61+
'port' => env('DB_PORT', 5432),
7862
'database' => env('DB_DATABASE', 'forge'),
7963
'username' => env('DB_USERNAME', 'forge'),
8064
'password' => env('DB_PASSWORD', ''),
81-
'charset' => env('DB_CHARSET', 'utf8'),
82-
'prefix' => env('DB_PREFIX', ''),
83-
'schema' => env('DB_SCHEMA', 'public'),
65+
'charset' => env('DB_CHARSET', 'utf8'),
66+
'prefix' => env('DB_PREFIX', ''),
67+
'schema' => env('DB_SCHEMA', 'public'),
68+
'sslmode' => env('DB_SSL_MODE', 'prefer'),
8469
],
8570

8671
'sqlsrv' => [
87-
'driver' => 'sqlsrv',
88-
'host' => env('DB_HOST', 'localhost'),
72+
'driver' => 'sqlsrv',
73+
'host' => env('DB_HOST', 'localhost'),
74+
'port' => env('DB_PORT', 1433),
8975
'database' => env('DB_DATABASE', 'forge'),
9076
'username' => env('DB_USERNAME', 'forge'),
9177
'password' => env('DB_PASSWORD', ''),
92-
'charset' => env('DB_CHARSET', 'utf8'),
93-
'prefix' => env('DB_PREFIX', ''),
78+
'charset' => env('DB_CHARSET', 'utf8'),
79+
'prefix' => env('DB_PREFIX', ''),
9480
],
9581

9682
],
@@ -126,10 +112,17 @@
126112
'cluster' => env('REDIS_CLUSTER', false),
127113

128114
'default' => [
129-
'host' => env('REDIS_HOST', '127.0.0.1'),
130-
'port' => env('REDIS_PORT', 6379),
131-
'database' => env('REDIS_DATABASE', 0),
115+
'host' => env('REDIS_HOST', '127.0.0.1'),
116+
'password' => env('REDIS_PASSWORD', null),
117+
'port' => env('REDIS_PORT', 6379),
118+
'database' => env('REDIS_DB', 0),
119+
],
120+
121+
'cache' => [
122+
'host' => env('REDIS_HOST', '127.0.0.1'),
132123
'password' => env('REDIS_PASSWORD', null),
124+
'port' => env('REDIS_PORT', 6379),
125+
'database' => env('REDIS_CACHE_DB', 1),
133126
],
134127

135128
],

‎config/filesystems.php

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
<?php
2+
3+
return [
4+
5+
/*
6+
|--------------------------------------------------------------------------
7+
| Default Filesystem Disk
8+
|--------------------------------------------------------------------------
9+
|
10+
| Here you may specify the default filesystem disk that should be used
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!
13+
|
14+
*/
15+
16+
'default' => env('FILESYSTEM_DRIVER', 'local'),
17+
18+
/*
19+
|--------------------------------------------------------------------------
20+
| Default Cloud Filesystem Disk
21+
|--------------------------------------------------------------------------
22+
|
23+
| Many applications store files both locally and in the cloud. For this
24+
| reason, you may specify a default "cloud" driver here. This driver
25+
| will be bound as the Cloud disk implementation in the container.
26+
|
27+
*/
28+
29+
'cloud' => env('FILESYSTEM_CLOUD', 's3'),
30+
31+
/*
32+
|--------------------------------------------------------------------------
33+
| Filesystem Disks
34+
|--------------------------------------------------------------------------
35+
|
36+
| Here you may configure as many filesystem "disks" as you wish, and you
37+
| may even configure multiple disks of the same driver. Defaults have
38+
| been setup for each driver as an example of the required options.
39+
|
40+
| Supported Drivers: "local", "ftp", "sftp", "s3", "rackspace"
41+
|
42+
*/
43+
44+
'disks' => [
45+
46+
'local' => [
47+
'driver' => 'local',
48+
'root' => storage_path('app'),
49+
],
50+
51+
'public' => [
52+
'driver' => 'local',
53+
'root' => storage_path('app/public'),
54+
'url' => env('APP_URL').'/storage',
55+
'visibility' => 'public',
56+
],
57+
58+
's3' => [
59+
'driver' => 's3',
60+
'key' => env('AWS_ACCESS_KEY_ID'),
61+
'secret' => env('AWS_SECRET_ACCESS_KEY'),
62+
'region' => env('AWS_DEFAULT_REGION'),
63+
'bucket' => env('AWS_BUCKET'),
64+
'url' => env('AWS_URL'),
65+
],
66+
67+
],
68+
69+
];

0 commit comments

Comments
 (0)