Skip to content

Commit 7a2f389

Browse files
taylorotwelltaylorotwell
committed
Merge branch 'master' of github.com:laravel/laravel
2 parents 7aa213a + b1c8ffa commit 7a2f389

13 files changed

+178
-22
lines changed

‎.env.example

+4-2
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,15 @@ QUEUE_CONNECTION=sync
2020
SESSION_DRIVER=file
2121
SESSION_LIFETIME=120
2222

23+
MEMCACHED_HOST=127.0.0.1
24+
2325
REDIS_HOST=127.0.0.1
2426
REDIS_PASSWORD=null
2527
REDIS_PORT=6379
2628

2729
MAIL_MAILER=smtp
28-
MAIL_HOST=smtp.mailtrap.io
29-
MAIL_PORT=2525
30+
MAIL_HOST=mailhog
31+
MAIL_PORT=1025
3032
MAIL_USERNAME=null
3133
MAIL_PASSWORD=null
3234
MAIL_ENCRYPTION=null

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
.env
77
.env.backup
88
.phpunit.result.cache
9+
docker-compose.override.yml
910
Homestead.json
1011
Homestead.yaml
1112
npm-debug.log

‎CHANGELOG.md

+83-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,88 @@
11
# Release Notes
22

3-
## [Unreleased](https://github.com/laravel/laravel/compare/v8.4.0...master)
3+
## [Unreleased](https://github.com/laravel/laravel/compare/v8.5.6...master)
4+
5+
6+
## [v8.5.6 (2020-12-22)](https://github.com/laravel/laravel/compare/v8.5.5...v8.5.6)
7+
8+
### Added
9+
- Add `lock_connection` ([](https://github.com/laravel/laravel/commit/bc339f712389cf536ad7e340453f35d1dd865777), [e8788a7](https://github.com/laravel/laravel/commit/e8788a768899ff2a2ef1fe78e24b46e6e10175dc))
10+
11+
12+
## [v8.5.5 (2020-12-12)](https://github.com/laravel/laravel/compare/v8.5.4...v8.5.5)
13+
14+
### Changed
15+
- Revert changes to env file ([3b2ed46](https://github.com/laravel/laravel/commit/3b2ed46e65c603ddc682753f1a9bb5472c4e12a8))
16+
17+
18+
## [v8.5.4 (2020-12-10)](https://github.com/laravel/laravel/compare/v8.5.3...v8.5.4)
19+
20+
### Changed
21+
- Gitignore `docker-compose.override.yml` ([#5487](https://github.com/laravel/laravel/pull/5487)
22+
- Update ENV vars to docker file ([ddb26fb](https://github.com/laravel/laravel/commit/ddb26fbc504cd64fb1b89511773aa8d03c758c6d))
23+
24+
25+
## [v8.5.3 (2020-12-10)](https://github.com/laravel/laravel/compare/v8.5.2...v8.5.3)
26+
27+
### Changed
28+
- Disable `TrustHosts` middleware ([b7cde8b](https://github.com/laravel/laravel/commit/b7cde8b495e183f386da63ff7792e0dea9cfcf56))
29+
30+
31+
## [v8.5.2 (2020-12-08)](https://github.com/laravel/laravel/compare/v8.5.1...v8.5.2)
32+
33+
### Added
34+
- Add Sail ([17668be](https://github.com/laravel/laravel/commit/17668beabe4cb489ad07abb8af0a9da01860601e))
35+
36+
37+
## [v8.5.1 (2020-12-08)](https://github.com/laravel/laravel/compare/v8.5.0...v8.5.1)
38+
39+
### Changed
40+
- Revert change to `QUEUE_CONNECTION` ([34368a4](https://github.com/laravel/laravel/commit/34368a4fab61839c106efb1eea087cc270639619))
41+
42+
43+
## [v8.5.0 (2020-12-08)](https://github.com/laravel/laravel/compare/v8.4.4...v8.5.0)
44+
45+
### Added
46+
- Add Sail file ([bcd87e8](https://github.com/laravel/laravel/commit/bcd87e80ac7fa6a5daf0e549059ad7cb0b41ce75))
47+
48+
### Changed
49+
- Update env file for Sail ([a895748](https://github.com/laravel/laravel/commit/a895748980b3e055ffcb68b6bc1c2e5fad6ecb08))
50+
51+
52+
## [v8.4.4 (2020-12-01)](https://github.com/laravel/laravel/compare/v8.4.3...v8.4.4)
53+
54+
### Changed
55+
- Comment out `Redis` facade by default ([612d166](https://github.com/laravel/laravel/commit/612d16600419265566d01a19c852ddb13b5e9f4b))
56+
- Uncomment `TrustHosts` middleware to enable it by default ([#5477](https://github.com/laravel/laravel/pull/5477))
57+
58+
### Removed
59+
- Remove cloud option ([82213fb](https://github.com/laravel/laravel/commit/82213fbf40fc4ec687781d0b93ff60a7de536913))
60+
61+
62+
## [v8.4.3 (2020-11-24)](https://github.com/laravel/laravel/compare/v8.4.2...v8.4.3)
63+
64+
### Added
65+
- Add ably entry ([5182e9c](https://github.com/laravel/laravel/commit/5182e9c6de805e025fb4cfad63c210c3197002ab))
66+
67+
### Fixed
68+
- Add missing null cache driver in `config/cache.php` ([#5472](https://github.com/laravel/laravel/pull/5472))
69+
70+
71+
## [v8.4.2 (2020-11-17)](https://github.com/laravel/laravel/compare/v8.4.1...v8.4.2)
72+
73+
### Changed
74+
- Add sanctum cookie endpoint to default cors paths ([aa6d3660](https://github.com/laravel/laravel/commit/aa6d3660114c93e537a52e0ba3c03071a7f3e67f))
75+
- Modify the `cache.php` docblocks ([#5468](https://github.com/laravel/laravel/pull/5468))
76+
- Add stub handler ([4931af1](https://github.com/laravel/laravel/commit/4931af14006610bf8fd1f860cea1117c68133e94))
77+
78+
### Fixed
79+
- Closed @auth correctly ([#5471](https://github.com/laravel/laravel/pull/5471))
80+
81+
82+
## [v8.4.1 (2020-11-10)](https://github.com/laravel/laravel/compare/v8.4.0...v8.4.1)
83+
84+
### Changed
85+
- Add auth line ([b54ef29](https://github.com/laravel/laravel/commit/b54ef297b3c723c8438596c6e6afef93a7458b98))
486

587

688
## [v8.4.0 (2020-10-30)](https://github.com/laravel/laravel/compare/v8.3.0...v8.4.0)

‎README.md

+1
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ We would like to extend our thanks to the following sponsors for funding Laravel
4242
- **[Many](https://www.many.co.uk)**
4343
- **[Webdock, Fast VPS Hosting](https://www.webdock.io/en)**
4444
- **[DevSquad](https://devsquad.com)**
45+
- **[Curotec](https://www.curotec.com/)**
4546
- **[OP.GG](https://op.gg)**
4647

4748
## Contributing

‎composer.json

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
},
1818
"require-dev": {
1919
"fakerphp/faker": "^1.9.1",
20+
"laravel/sail": "^0.0.5",
2021
"mockery/mockery": "^1.4.2",
2122
"nunomaduro/collision": "^5.0",
2223
"phpunit/phpunit": "^9.3.3"

‎config/app.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@
215215
'Password' => Illuminate\Support\Facades\Password::class,
216216
'Queue' => Illuminate\Support\Facades\Queue::class,
217217
'Redirect' => Illuminate\Support\Facades\Redirect::class,
218-
'Redis' => Illuminate\Support\Facades\Redis::class,
218+
// 'Redis' => Illuminate\Support\Facades\Redis::class,
219219
'Request' => Illuminate\Support\Facades\Request::class,
220220
'Response' => Illuminate\Support\Facades\Response::class,
221221
'Route' => Illuminate\Support\Facades\Route::class,

‎config/broadcasting.php

+5
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,11 @@
4141
],
4242
],
4343

44+
'ably' => [
45+
'driver' => 'ably',
46+
'key' => env('ABLY_KEY'),
47+
],
48+
4449
'redis' => [
4550
'driver' => 'redis',
4651
'connection' => 'default',

‎config/cache.php

+5-3
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@
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",
17-
| "memcached", "redis", "dynamodb"
18-
|
1916
*/
2017

2118
'default' => env('CACHE_DRIVER', 'file'),
@@ -29,6 +26,9 @@
2926
| well as their drivers. You may even define multiple stores for the
3027
| same cache driver to group types of items stored in your caches.
3128
|
29+
| Supported drivers: "apc", "array", "database", "file",
30+
| "memcached", "redis", "dynamodb", "null"
31+
|
3232
*/
3333

3434
'stores' => [
@@ -46,6 +46,7 @@
4646
'driver' => 'database',
4747
'table' => 'cache',
4848
'connection' => null,
49+
'lock_connection' => null,
4950
],
5051

5152
'file' => [
@@ -75,6 +76,7 @@
7576
'redis' => [
7677
'driver' => 'redis',
7778
'connection' => 'cache',
79+
'lock_connection' => 'default',
7880
],
7981

8082
'dynamodb' => [

‎config/cors.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
|
1616
*/
1717

18-
'paths' => ['api/*'],
18+
'paths' => ['api/*', 'sanctum/csrf-cookie'],
1919

2020
'allowed_methods' => ['*'],
2121

‎config/filesystems.php

-13
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,6 @@
1515

1616
'default' => env('FILESYSTEM_DRIVER', 'local'),
1717

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-
3118
/*
3219
|--------------------------------------------------------------------------
3320
| Filesystem Disks

‎docker-compose.yml

+74
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
# For more information: https://laravel.com/docs/sail
2+
version: '3'
3+
services:
4+
laravel.test:
5+
build:
6+
context: ./vendor/laravel/sail/runtimes/8.0
7+
dockerfile: Dockerfile
8+
args:
9+
WWWGROUP: '${WWWGROUP}'
10+
image: sail-8.0/app
11+
ports:
12+
- '${APP_PORT:-80}:80'
13+
environment:
14+
WWWUSER: '${WWWUSER}'
15+
LARAVEL_SAIL: 1
16+
volumes:
17+
- '.:/var/www/html'
18+
networks:
19+
- sail
20+
depends_on:
21+
- mysql
22+
- redis
23+
# - selenium
24+
# selenium:
25+
# image: 'selenium/standalone-chrome'
26+
# volumes:
27+
# - '/dev/shm:/dev/shm'
28+
# networks:
29+
# - sail
30+
# depends_on:
31+
# - laravel.test
32+
mysql:
33+
image: 'mysql:8.0'
34+
ports:
35+
- '${FORWARD_DB_PORT:-3306}:3306'
36+
environment:
37+
MYSQL_ROOT_PASSWORD: '${DB_PASSWORD}'
38+
MYSQL_DATABASE: '${DB_DATABASE}'
39+
MYSQL_USER: '${DB_USERNAME}'
40+
MYSQL_PASSWORD: '${DB_PASSWORD}'
41+
MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
42+
volumes:
43+
- 'sailmysql:/var/lib/mysql'
44+
networks:
45+
- sail
46+
redis:
47+
image: 'redis:alpine'
48+
ports:
49+
- '${FORWARD_REDIS_PORT:-6379}:6379'
50+
volumes:
51+
- 'sailredis:/data'
52+
networks:
53+
- sail
54+
# memcached:
55+
# image: 'memcached:alpine'
56+
# ports:
57+
# - '11211:11211'
58+
# networks:
59+
# - sail
60+
mailhog:
61+
image: 'mailhog/mailhog:latest'
62+
ports:
63+
- 1025:1025
64+
- 8025:8025
65+
networks:
66+
- sail
67+
networks:
68+
sail:
69+
driver: bridge
70+
volumes:
71+
sailmysql:
72+
driver: local
73+
sailredis:
74+
driver: local

‎resources/lang/en/auth.php

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
*/
1515

1616
'failed' => 'These credentials do not match our records.',
17+
'password' => 'The provided password is incorrect.',
1718
'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
1819

1920
];

‎resources/views/welcome.blade.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
@if (Route::has('register'))
3333
<a href="{{ route('register') }}" class="ml-4 text-sm text-gray-700 underline">Register</a>
3434
@endif
35-
@endif
35+
@endauth
3636
</div>
3737
@endif
3838

0 commit comments

Comments
 (0)