Skip to content

Commit a690bf9

Browse files
verwilstverwilst
committed
merge more laravel 5.4
1 parent 110dec3 commit a690bf9

19 files changed

+80
-121
lines changed

‎.env.example‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ MAIL_PASSWORD=null
2828
MAIL_ENCRYPTION=null
2929

3030
PUSHER_APP_ID=
31-
PUSHER_KEY=
32-
PUSHER_SECRET=
31+
PUSHER_APP_KEY=
32+
PUSHER_APP_SECRET=
3333

3434
API_PREFIX=api
3535
API_VERSION=v1

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
/node_modules
2+
/storage/*.key
3+
/public/hot
24
/public/storage
35
/public/vendor
46
/public/css/*

‎composer.json‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"require-dev": {
1515
"fzaninotto/faker": "~1.4",
1616
"mockery/mockery": "0.9.*",
17-
"phpunit/phpunit": "~5.0",
17+
"phpunit/phpunit": "~5.7",
1818
"symfony/css-selector": "3.1.*",
1919
"symfony/dom-crawler": "3.1.*"
2020
},
@@ -27,9 +27,9 @@
2727
}
2828
},
2929
"autoload-dev": {
30-
"classmap": [
31-
"tests/TestCase.php"
32-
]
30+
"psr-4": {
31+
"Tests\\": "tests/"
32+
}
3333
},
3434
"scripts": {
3535
"post-root-package-install": [
@@ -40,10 +40,7 @@
4040
],
4141
"post-install-cmd": [
4242
"Illuminate\\Foundation\\ComposerScripts::postInstall",
43-
"php artisan optimize",
44-
"php -r \"file_exists('.env') || copy('.env.example', '.env');\"",
45-
"php artisan key:generate",
46-
"php artisan jwt:secret"
43+
"php artisan optimize"
4744
],
4845
"post-update-cmd": [
4946
"Illuminate\\Foundation\\ComposerScripts::postUpdate",

‎config/app.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,7 @@
206206
'Artisan' => Illuminate\Support\Facades\Artisan::class,
207207
'Auth' => Illuminate\Support\Facades\Auth::class,
208208
'Blade' => Illuminate\Support\Facades\Blade::class,
209+
'Broadcast' => Illuminate\Support\Facades\Broadcast::class,
209210
'Bus' => Illuminate\Support\Facades\Bus::class,
210211
'Cache' => Illuminate\Support\Facades\Cache::class,
211212
'Config' => Illuminate\Support\Facades\Config::class,

‎config/broadcasting.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232

3333
'pusher' => [
3434
'driver' => 'pusher',
35-
'key' => env('PUSHER_KEY'),
36-
'secret' => env('PUSHER_SECRET'),
35+
'key' => env('PUSHER_APP_KEY'),
36+
'secret' => env('PUSHER_APP_SECRET'),
3737
'app_id' => env('PUSHER_APP_ID'),
3838
'options' => [
3939
//

‎config/cache.php‎

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

4747
'file' => [
4848
'driver' => 'file',
49-
'path' => storage_path('framework/cache'),
49+
'path' => storage_path('framework/cache/data'),
5050
],
5151

5252
'memcached' => [

‎config/database.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@
5959
'database' => env('DB_DATABASE', 'forge'),
6060
'username' => env('DB_USERNAME', 'forge'),
6161
'password' => env('DB_PASSWORD', ''),
62-
'charset' => 'utf8',
63-
'collation' => 'utf8_unicode_ci',
62+
'charset' => 'utf8mb4',
63+
'collation' => 'utf8mb4_unicode_ci',
6464
'prefix' => '',
6565
'strict' => true,
6666
'engine' => null,
@@ -116,7 +116,7 @@
116116

117117
'redis' => [
118118

119-
'cluster' => false,
119+
'client' => 'predis',
120120

121121
'default' => [
122122
'host' => env('REDIS_HOST', 'localhost'),

‎config/filesystems.php‎

Lines changed: 9 additions & 8 deletions
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", "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", "s3", "rackspace"
41+
|
4242
*/
4343

4444
'disks' => [
@@ -51,15 +51,16 @@
5151
'public' => [
5252
'driver' => 'local',
5353
'root' => storage_path('app/public'),
54+
'url' => env('APP_URL').'/storage',
5455
'visibility' => 'public',
5556
],
5657

5758
's3' => [
5859
'driver' => 's3',
59-
'key' => 'your-key',
60-
'secret' => 'your-secret',
61-
'region' => 'your-region',
62-
'bucket' => 'your-bucket',
60+
'key' => env('AWS_KEY'),
61+
'secret' => env('AWS_SECRET'),
62+
'region' => env('AWS_REGION'),
63+
'bucket' => env('AWS_BUCKET'),
6364
],
6465

6566
],

‎config/mail.php‎

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
| sending of e-mail. You may specify which one you're using throughout
1212
| your application here. By default, Laravel is setup for SMTP mail.
1313
|
14-
| Supported: "smtp", "mail", "sendmail", "mailgun", "mandrill",
15-
| "ses", "sparkpost", "log"
14+
| Supported: "smtp", "sendmail", "mailgun", "mandrill", "ses",
15+
| "sparkpost", "log", "array"
1616
|
1717
*/
1818

@@ -56,8 +56,8 @@
5656
*/
5757

5858
'from' => [
59-
'address' => 'hello@example.com',
60-
'name' => 'Example',
59+
'address' => env('MAIL_FROM_ADDRESS', 'hello@example.com'),
60+
'name' => env('MAIL_FROM_NAME', 'Example'),
6161
],
6262

6363
/*
@@ -86,30 +86,38 @@
8686

8787
'username' => env('MAIL_USERNAME'),
8888

89+
'password' => env('MAIL_PASSWORD'),
90+
8991
/*
9092
|--------------------------------------------------------------------------
91-
| SMTP Server Password
93+
| Sendmail System Path
9294
|--------------------------------------------------------------------------
9395
|
94-
| Here you may set the password required by your SMTP server to send out
95-
| messages from your application. This will be given to the server on
96-
| connection so that the application will be able to send messages.
96+
| When using the "sendmail" driver to send e-mails, we will need to know
97+
| the path to where Sendmail lives on this server. A default path has
98+
| been provided here, which will work well on most of your systems.
9799
|
98100
*/
99101

100-
'password' => env('MAIL_PASSWORD'),
102+
'sendmail' => '/usr/sbin/sendmail -bs',
101103

102104
/*
103105
|--------------------------------------------------------------------------
104-
| Sendmail System Path
106+
| Markdown Mail Settings
105107
|--------------------------------------------------------------------------
106108
|
107-
| When using the "sendmail" driver to send e-mails, we will need to know
108-
| the path to where Sendmail lives on this server. A default path has
109-
| been provided here, which will work well on most of your systems.
109+
| If you are using Markdown based email rendering, you may configure your
110+
| theme and component paths here, allowing you to customize the design
111+
| of the emails. Or, you may simply stick with the Laravel defaults!
110112
|
111113
*/
112114

113-
'sendmail' => '/usr/sbin/sendmail -bs',
115+
'markdown' => [
116+
'theme' => 'default',
117+
118+
'paths' => [
119+
resource_path('views/vendor/mail'),
120+
],
121+
],
114122

115123
];

‎config/queue.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
| Default Queue Driver
88
|--------------------------------------------------------------------------
99
|
10-
| The Laravel queue API supports a variety of back-ends via an unified
10+
| Laravel's queue API supports an assortment of back-ends via a single
1111
| API, giving you convenient access to each back-end using the same
1212
| syntax for each one. Here you may set the default queue driver.
1313
|

0 commit comments

Comments
 (0)