Skip to content

Commit 1d8add8

Browse files
taylorotwelltaylorotwell
committed
Merge branch 'develop' of github.com:laravel/laravel into develop
2 parents d201c69 + 3c53897 commit 1d8add8

File tree

17 files changed

+127
-55
lines changed

17 files changed

+127
-55
lines changed

‎CHANGELOG.md

Lines changed: 39 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,33 @@
11
# Release Notes
22

3+
## [Unreleased](https://github.com/laravel/laravel/compare/v5.7.19...master)
4+
5+
### Added
6+
- Hint for lenient log stacks ([#4918](https://github.com/laravel/laravel/pull/4918))
7+
- Attribute casting for `email_verified_at` on `User` model stub ([#4930](https://github.com/laravel/laravel/pull/4930))
8+
9+
### Changed
10+
- Remove unused Bootstrap class ([#4917](https://github.com/laravel/laravel/pull/4917))
11+
- Change order of boot and register methods in service providers ([#4921](https://github.com/laravel/laravel/pull/4921))
12+
- `web.config` comment to help debug issues ([#4924](https://github.com/laravel/laravel/pull/4924))
13+
- Use `Str::random()` instead of `str_random()` ([#4926](https://github.com/laravel/laravel/pull/4926))
14+
- Remove unnecessary link type on "welcome" view ([#4935](https://github.com/laravel/laravel/pull/4935))
15+
16+
17+
## [v5.7.19 (2018-12-15)](https://github.com/laravel/laravel/compare/v5.7.15...v5.7.19)
18+
19+
### Added
20+
- Add language entry for `starts_with` rule ([#4866](https://github.com/laravel/laravel/pull/4866))
21+
- Add env variable ([e1b8847](https://github.com/laravel/laravel/commit/e1b8847a92bdd85163990ee2e3284262da09b5fd))
22+
23+
### Changed
24+
- Update .gitignore ([bc435e7](https://github.com/laravel/laravel/commit/bc435e7fdd8308d133a404b1daa811dd30d95fe5))
25+
- Bump to Mix v4 ([4882](https://github.com/laravel/laravel/pull/4882))
26+
27+
### Fixed
28+
- Fixed mixed up comment order ([#4867](https://github.com/laravel/laravel/pull/4867))
29+
30+
331
## [v5.7.15 (2018-11-22)](https://github.com/laravel/laravel/compare/v5.7.13...v5.7.15)
432

533
### Added
@@ -101,7 +129,7 @@
101129
- Set `bcrypt rounds` using the `hashing` config ([#4643](https://github.com/laravel/laravel/pull/4643))
102130

103131

104-
## v5.6.12 (2018-03-14)
132+
## [v5.6.12 (2018-03-14)](https://github.com/laravel/laravel/compare/v5.6.7...v5.6.12)
105133

106134
### Added
107135
- Added message for `not_regex` validation rule ([#4602](https://github.com/laravel/laravel/pull/4602))
@@ -115,7 +143,7 @@
115143
- Removed "thanks" package ([#4593](https://github.com/laravel/laravel/pull/4593))
116144

117145

118-
## v5.6.7 (2018-02-27)
146+
## [v5.6.7 (2018-02-27)](https://github.com/laravel/laravel/compare/v5.6.0...v5.6.7)
119147

120148
### Changed
121149
- Use `Hash::make()` in `RegisterController` ([#4570](https://github.com/laravel/laravel/pull/4570))
@@ -125,7 +153,7 @@
125153
- Removed Bootstrap 3 variables ([#4572](https://github.com/laravel/laravel/pull/4572))
126154

127155

128-
## v5.6.0 (2018-02-07)
156+
## [v5.6.0 (2018-02-07)](https://github.com/laravel/laravel/compare/v5.5.28...v5.6.0)
129157

130158
### Added
131159
- Added `filesystems.disks.s3.url` config parameter ([#4483](https://github.com/laravel/laravel/pull/4483))
@@ -145,7 +173,7 @@
145173
- Use Mix environment variables ([224f994](https://github.com/laravel/laravel/commit/224f9949c74fcea2eeceae0a1f65d9c2e7498a27), [2db1e0c](https://github.com/laravel/laravel/commit/2db1e0c5e8525f3ee4b3850f0116c13224790dff))
146174

147175

148-
## v5.5.28 (2018-01-03)
176+
## [v5.5.28 (2018-01-03)](https://github.com/laravel/laravel/compare/v5.5.22...v5.5.28)
149177

150178
### Added
151179
- Added `symfony/thanks` ([60de3a5](https://github.com/laravel/laravel/commit/60de3a5670c4a3bf5fb96433828b6aadd7df0e53))
@@ -157,7 +185,7 @@
157185
- Updated default Echo configuration for Pusher ([#4525](https://github.com/laravel/laravel/pull/4525), [aad5940](https://github.com/laravel/laravel/commit/aad59400e2d69727224a3ca9b6aa9f9d7c87e9f7), [#4526](https://github.com/laravel/laravel/pull/4526), [a32af97](https://github.com/laravel/laravel/commit/a32af97ede49fdd57e8217a9fd484b4cb4ab1bbf))
158186

159187

160-
## v5.5.22 (2017-11-21)
188+
## [v5.5.22 (2017-11-21)](https://github.com/laravel/laravel/compare/v5.5.0...v5.5.22)
161189

162190
### Added
163191
- Added `-Indexes` option in `.htaccess` ([#4422](https://github.com/laravel/laravel/pull/4422))
@@ -173,7 +201,7 @@
173201
- Fixed directive order in `.htaccess` ([#4433](https://github.com/laravel/laravel/pull/4433))
174202

175203

176-
## v5.5.0 (2017-08-30)
204+
## [v5.5.0 (2017-08-30)](https://github.com/laravel/laravel/compare/v5.4.30...v5.5.0)
177205

178206
### Added
179207
- Added `same_site` to `session.php` config ([#4168](https://github.com/laravel/laravel/pull/4168))
@@ -199,7 +227,7 @@
199227
- Removed migrations from autoload classmap ([#4340](https://github.com/laravel/laravel/pull/4340))
200228

201229

202-
## v5.4.30 (2017-07-20)
230+
## [v5.4.30 (2017-07-20)](https://github.com/laravel/laravel/compare/v5.4.23...v5.4.30)
203231

204232
### Changed
205233
- Simplified mix require ([#4283](https://github.com/laravel/laravel/pull/4283))
@@ -212,7 +240,7 @@
212240
- Use quotes in `app.scss` ([#4287](https://github.com/laravel/laravel/pull/4287))
213241

214242

215-
## v5.4.23 (2017-05-11)
243+
## [v5.4.23 (2017-05-11)](https://github.com/laravel/laravel/compare/v5.4.21...v5.4.23)
216244

217245
### Added
218246
- Added SQL Server connection ([#4253](https://github.com/laravel/laravel/pull/4253), [#4254](https://github.com/laravel/laravel/pull/4254))
@@ -226,7 +254,7 @@
226254
- Added missing `ipv4` and `ipv6` validation messages ([#4261](https://github.com/laravel/laravel/pull/4261))
227255

228256

229-
## v5.4.21 (2017-04-28)
257+
## [v5.4.21 (2017-04-28)](https://github.com/laravel/laravel/compare/v5.4.19...v5.4.21)
230258

231259
### Added
232260
- Added `FILESYSTEM_DRIVER` and `FILESYSTEM_CLOUD` environment variables ([#4236](https://github.com/laravel/laravel/pull/4236))
@@ -235,7 +263,7 @@
235263
- Use lowercase doctype ([#4241](https://github.com/laravel/laravel/pull/4241))
236264

237265

238-
## v5.4.19 (2017-04-20)
266+
## [v5.4.19 (2017-04-20)](https://github.com/laravel/laravel/compare/v5.4.16...v5.4.19)
239267

240268
### Added
241269
- Added `optimize-autoloader` to `config` in `composer.json` ([#4189](https://github.com/laravel/laravel/pull/4189))
@@ -253,7 +281,7 @@
253281
- Use fluent middleware definition in `LoginController` ([#4229](https://github.com/laravel/laravel/pull/4229))
254282

255283

256-
## v5.4.16 (2017-03-17)
284+
## [v5.4.16 (2017-03-17)](https://github.com/laravel/laravel/compare/v5.4.15...v5.4.16)
257285

258286
### Added
259287
- Added `unix_socket` to `mysql` in `config/database.php` ()[#4179](https://github.com/laravel/laravel/pull/4179))

‎app/Http/Middleware/RedirectIfAuthenticated.php

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,15 @@ class RedirectIfAuthenticated
1212
*
1313
* @param \Illuminate\Http\Request $request
1414
* @param \Closure $next
15-
* @param string|null $guard
15+
* @param string[] ...$guards
1616
* @return mixed
1717
*/
18-
public function handle($request, Closure $next, $guard = null)
18+
public function handle($request, Closure $next, ...$guards)
1919
{
20-
if (Auth::guard($guard)->check()) {
21-
return redirect('/home');
20+
foreach ($guards as $guard) {
21+
if (Auth::guard($guard)->check()) {
22+
return redirect('/home');
23+
}
2224
}
2325

2426
return $next($request);

‎app/Providers/AppServiceProvider.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,21 @@
77
class AppServiceProvider extends ServiceProvider
88
{
99
/**
10-
* Bootstrap any application services.
10+
* Register any application services.
1111
*
1212
* @return void
1313
*/
14-
public function boot()
14+
public function register()
1515
{
1616
//
1717
}
1818

1919
/**
20-
* Register any application services.
20+
* Bootstrap any application services.
2121
*
2222
* @return void
2323
*/
24-
public function register()
24+
public function boot()
2525
{
2626
//
2727
}

‎app/User.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,13 @@ class User extends Authenticatable
2727
protected $hidden = [
2828
'password', 'remember_token',
2929
];
30+
31+
/**
32+
* The attributes that should be cast to native types.
33+
*
34+
* @var array
35+
*/
36+
protected $casts = [
37+
'email_verified_at' => 'datetime',
38+
];
3039
}

‎composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"fzaninotto/faker": "^1.4",
2020
"mockery/mockery": "^1.0",
2121
"nunomaduro/collision": "^2.0",
22-
"phpunit/phpunit": "^7.0"
22+
"phpunit/phpunit": "^7.5"
2323
},
2424
"config": {
2525
"optimize-autoloader": true,

‎config/cache.php

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
| using this caching library. This connection is used when another is
1414
| not explicitly specified when executing a given caching function.
1515
|
16-
| Supported: "apc", "array", "database", "file", "memcached", "redis"
16+
| Supported: "apc", "array", "database", "file",
17+
| "memcached", "redis", "dynamodb"
1718
|
1819
*/
1920

@@ -59,7 +60,7 @@
5960
env('MEMCACHED_PASSWORD'),
6061
],
6162
'options' => [
62-
// Memcached::OPT_CONNECT_TIMEOUT => 2000,
63+
// Memcached::OPT_CONNECT_TIMEOUT => 2000,
6364
],
6465
'servers' => [
6566
[
@@ -75,6 +76,14 @@
7576
'connection' => 'cache',
7677
],
7778

79+
'dynamodb' => [
80+
'driver' => 'dynamodb',
81+
'key' => env('AWS_ACCESS_KEY_ID'),
82+
'secret' => env('AWS_SECRET_ACCESS_KEY'),
83+
'region' => env('AWS_REGION', 'us-east-1'),
84+
'table' => env('DYNAMODB_CACHE_TABLE', 'cache'),
85+
],
86+
7887
],
7988

8089
/*

‎config/database.php

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,9 @@
5454
'prefix_indexes' => true,
5555
'strict' => true,
5656
'engine' => null,
57+
'options' => array_filter([
58+
PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'),
59+
]),
5760
],
5861

5962
'pgsql' => [
@@ -110,20 +113,30 @@
110113

111114
'redis' => [
112115

113-
'client' => 'predis',
116+
'client' => env('REDIS_CLIENT', 'predis'),
114117

115-
'default' => [
116-
'host' => env('REDIS_HOST', '127.0.0.1'),
117-
'password' => env('REDIS_PASSWORD', null),
118-
'port' => env('REDIS_PORT', 6379),
119-
'database' => env('REDIS_DB', 0),
118+
'options' => [
119+
'cluster' => env('REDIS_CLUSTER', 'predis'),
120120
],
121121

122-
'cache' => [
123-
'host' => env('REDIS_HOST', '127.0.0.1'),
124-
'password' => env('REDIS_PASSWORD', null),
125-
'port' => env('REDIS_PORT', 6379),
126-
'database' => env('REDIS_CACHE_DB', 1),
122+
'clusters' => [
123+
'default' => [
124+
[
125+
'host' => env('REDIS_HOST', '127.0.0.1'),
126+
'password' => env('REDIS_PASSWORD', null),
127+
'port' => env('REDIS_PORT', 6379),
128+
'database' => env('REDIS_DB', 0),
129+
],
130+
],
131+
132+
'cache' => [
133+
[
134+
'host' => env('REDIS_HOST', '127.0.0.1'),
135+
'password' => env('REDIS_PASSWORD', null),
136+
'port' => env('REDIS_PORT', 6379),
137+
'database' => env('REDIS_CACHE_DB', 1),
138+
],
139+
],
127140
],
128141

129142
],

‎config/logging.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
'stack' => [
3838
'driver' => 'stack',
3939
'channels' => ['daily'],
40+
'ignore_exceptions' => false,
4041
],
4142

4243
'single' => [
@@ -61,7 +62,7 @@
6162
],
6263

6364
'papertrail' => [
64-
'driver' => 'monolog',
65+
'driver' => 'monolog',
6566
'level' => 'debug',
6667
'handler' => SyslogUdpHandler::class,
6768
'handler_with' => [

‎config/queue.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
'host' => 'localhost',
4747
'queue' => 'default',
4848
'retry_after' => 90,
49+
'block_for' => 0,
4950
],
5051

5152
'sqs' => [

‎config/session.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
| you may specify any of the other wonderful drivers provided here.
1515
|
1616
| Supported: "file", "cookie", "database", "apc",
17-
| "memcached", "redis", "array"
17+
| "memcached", "redis", "dynamodb", "array"
1818
|
1919
*/
2020

@@ -92,9 +92,9 @@
9292
| Session Cache Store
9393
|--------------------------------------------------------------------------
9494
|
95-
| When using the "apc" or "memcached" session drivers, you may specify a
96-
| cache store that should be used for these sessions. This value must
97-
| correspond with one of the application's configured cache stores.
95+
| When using the "apc", "memcached", or "dynamodb" session drivers you may
96+
| list a cache store that should be used for these sessions. This value
97+
| must match with one of the application's configured cache "stores".
9898
|
9999
*/
100100

‎database/factories/UserFactory.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?php
22

33
use App\User;
4+
use Illuminate\Support\Str;
45
use Faker\Generator as Faker;
56

67
/*
@@ -20,6 +21,6 @@
2021
'email' => $faker->unique()->safeEmail,
2122
'email_verified_at' => now(),
2223
'password' => '$2y$10$92IXUNpkjO0rOQ5byMi.Ye4oKoEa3Ro9llC/.og/at2.uheWG/igi', // password
23-
'remember_token' => str_random(10),
24+
'remember_token' => Str::random(10),
2425
];
2526
});

‎phpunit.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
</whitelist>
2424
</filter>
2525
<php>
26-
<env name="APP_ENV" value="testing"/>
27-
<env name="BCRYPT_ROUNDS" value="4"/>
28-
<env name="CACHE_DRIVER" value="array"/>
29-
<env name="MAIL_DRIVER" value="array"/>
30-
<env name="QUEUE_CONNECTION" value="sync"/>
31-
<env name="SESSION_DRIVER" value="array"/>
26+
<server name="APP_ENV" value="testing"/>
27+
<server name="BCRYPT_ROUNDS" value="4"/>
28+
<server name="CACHE_DRIVER" value="array"/>
29+
<server name="MAIL_DRIVER" value="array"/>
30+
<server name="QUEUE_CONNECTION" value="sync"/>
31+
<server name="SESSION_DRIVER" value="array"/>
3232
</php>
3333
</phpunit>

‎public/js/app.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/web.config

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
<!--
2+
Rewrites requires Microsoft URL Rewrite Module for IIS
3+
Download: https://www.microsoft.com/en-us/download/details.aspx?id=47337
4+
Debug Help: https://docs.microsoft.com/en-us/iis/extensions/url-rewrite-module/using-failed-request-tracing-to-trace-rewrite-rules
5+
-->
16
<configuration>
27
<system.webServer>
38
<rewrite>

0 commit comments

Comments
 (0)