-
Notifications
You must be signed in to change notification settings - Fork 4
/
Copy pathv8.4.0...v8.5.1.diff
321 lines (299 loc) · 9.99 KB
/
v8.4.0...v8.5.1.diff
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
diff --git a/.env.example b/.env.example
index 7dc51e1f..68c9578c 100644
--- a/.env.example
+++ b/.env.example
@@ -8,7 +8,8 @@ LOG_CHANNEL=stack
LOG_LEVEL=debug
DB_CONNECTION=mysql
-DB_HOST=127.0.0.1
+# DB_HOST=127.0.0.1
+DB_HOST=mysql
DB_PORT=3306
DB_DATABASE=laravel
DB_USERNAME=root
@@ -20,13 +21,17 @@ QUEUE_CONNECTION=sync
SESSION_DRIVER=file
SESSION_LIFETIME=120
-REDIS_HOST=127.0.0.1
+# MEMCACHED_HOST=127.0.0.1
+MEMCACHED_HOST=memcached
+
+# REDIS_HOST=127.0.0.1
+REDIS_HOST=redis
REDIS_PASSWORD=null
REDIS_PORT=6379
MAIL_MAILER=smtp
-MAIL_HOST=smtp.mailtrap.io
-MAIL_PORT=2525
+MAIL_HOST=mailhog
+MAIL_PORT=1025
MAIL_USERNAME=null
MAIL_PASSWORD=null
MAIL_ENCRYPTION=null
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 53536a64..195610f2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,42 @@
# Release Notes
-## [Unreleased](https://github.com/laravel/laravel/compare/v8.4.0...master)
+## [Unreleased](https://github.com/laravel/laravel/compare/v8.4.4...8.x)
+
+
+## [v8.4.4 (2020-12-01)](https://github.com/laravel/laravel/compare/v8.4.3...v8.4.4)
+
+### Changed
+- Comment out `Redis` facade by default ([612d166](https://github.com/laravel/laravel/commit/612d16600419265566d01a19c852ddb13b5e9f4b))
+- Uncomment `TrustHosts` middleware to enable it by default ([#5477](https://github.com/laravel/laravel/pull/5477))
+
+### Removed
+- Remove cloud option ([82213fb](https://github.com/laravel/laravel/commit/82213fbf40fc4ec687781d0b93ff60a7de536913))
+
+
+## [v8.4.3 (2020-11-24)](https://github.com/laravel/laravel/compare/v8.4.2...v8.4.3)
+
+### Added
+- Add ably entry ([5182e9c](https://github.com/laravel/laravel/commit/5182e9c6de805e025fb4cfad63c210c3197002ab))
+
+### Fixed
+- Add missing null cache driver in `config/cache.php` ([#5472](https://github.com/laravel/laravel/pull/5472))
+
+
+## [v8.4.2 (2020-11-17)](https://github.com/laravel/laravel/compare/v8.4.1...v8.4.2)
+
+### Changed
+- Add sanctum cookie endpoint to default cors paths ([aa6d3660](https://github.com/laravel/laravel/commit/aa6d3660114c93e537a52e0ba3c03071a7f3e67f))
+- Modify the `cache.php` docblocks ([#5468](https://github.com/laravel/laravel/pull/5468))
+- Add stub handler ([4931af1](https://github.com/laravel/laravel/commit/4931af14006610bf8fd1f860cea1117c68133e94))
+
+### Fixed
+- Closed @auth correctly ([#5471](https://github.com/laravel/laravel/pull/5471))
+
+
+## [v8.4.1 (2020-11-10)](https://github.com/laravel/laravel/compare/v8.4.0...v8.4.1)
+
+### Changed
+- Add auth line ([b54ef29](https://github.com/laravel/laravel/commit/b54ef297b3c723c8438596c6e6afef93a7458b98))
## [v8.4.0 (2020-10-30)](https://github.com/laravel/laravel/compare/v8.3.0...v8.4.0)
@@ -66,6 +102,6 @@
- Re-add property to route service provider ([9cbc381](https://github.com/laravel/laravel/commit/9cbc3819f7b1c268447996d347a1733aa68e16d7))
-## [v8.0.0 (2020-09-08)](https://github.com/laravel/laravel/compare/v7.30.0...v8.0.0)
+## [v8.0.0 (2020-09-08)](https://github.com/laravel/laravel/compare/v7.30.1...v8.0.0)
Laravel 8 comes with a lot of changes to the base skeleton. Please consult the diff to see what's changed.
diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
index 7e40d735..f9644add 100644
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -3,6 +3,7 @@
namespace App\Exceptions;
use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
+use Throwable;
class Handler extends ExceptionHandler
{
@@ -32,6 +33,8 @@ class Handler extends ExceptionHandler
*/
public function register()
{
- //
+ $this->reportable(function (Throwable $e) {
+ //
+ });
}
}
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index 30020a50..21a8754b 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -14,7 +14,7 @@ class Kernel extends HttpKernel
* @var array
*/
protected $middleware = [
- // \App\Http\Middleware\TrustHosts::class,
+ \App\Http\Middleware\TrustHosts::class,
\App\Http\Middleware\TrustProxies::class,
\Fruitcake\Cors\HandleCors::class,
\App\Http\Middleware\PreventRequestsDuringMaintenance::class,
diff --git a/config/app.php b/config/app.php
index 8409e00e..2a2f0ebe 100644
--- a/config/app.php
+++ b/config/app.php
@@ -215,7 +215,7 @@ return [
'Password' => Illuminate\Support\Facades\Password::class,
'Queue' => Illuminate\Support\Facades\Queue::class,
'Redirect' => Illuminate\Support\Facades\Redirect::class,
- 'Redis' => Illuminate\Support\Facades\Redis::class,
+ // 'Redis' => Illuminate\Support\Facades\Redis::class,
'Request' => Illuminate\Support\Facades\Request::class,
'Response' => Illuminate\Support\Facades\Response::class,
'Route' => Illuminate\Support\Facades\Route::class,
diff --git a/config/broadcasting.php b/config/broadcasting.php
index 3bba1103..ef208598 100644
--- a/config/broadcasting.php
+++ b/config/broadcasting.php
@@ -41,6 +41,11 @@ return [
],
],
+ 'ably' => [
+ 'driver' => 'ably',
+ 'key' => env('ABLY_KEY'),
+ ],
+
'redis' => [
'driver' => 'redis',
'connection' => 'default',
diff --git a/config/cache.php b/config/cache.php
index 4f41fdf9..9473acc9 100644
--- a/config/cache.php
+++ b/config/cache.php
@@ -13,9 +13,6 @@ return [
| using this caching library. This connection is used when another is
| not explicitly specified when executing a given caching function.
|
- | Supported: "apc", "array", "database", "file",
- | "memcached", "redis", "dynamodb"
- |
*/
'default' => env('CACHE_DRIVER', 'file'),
@@ -29,6 +26,9 @@ return [
| well as their drivers. You may even define multiple stores for the
| same cache driver to group types of items stored in your caches.
|
+ | Supported drivers: "apc", "array", "database", "file",
+ | "memcached", "redis", "dynamodb", "null"
+ |
*/
'stores' => [
diff --git a/config/cors.php b/config/cors.php
index 558369dc..8a39e6da 100644
--- a/config/cors.php
+++ b/config/cors.php
@@ -15,7 +15,7 @@ return [
|
*/
- 'paths' => ['api/*'],
+ 'paths' => ['api/*', 'sanctum/csrf-cookie'],
'allowed_methods' => ['*'],
diff --git a/config/filesystems.php b/config/filesystems.php
index 94c81126..10c9d9be 100644
--- a/config/filesystems.php
+++ b/config/filesystems.php
@@ -15,19 +15,6 @@ return [
'default' => env('FILESYSTEM_DRIVER', 'local'),
- /*
- |--------------------------------------------------------------------------
- | Default Cloud Filesystem Disk
- |--------------------------------------------------------------------------
- |
- | Many applications store files both locally and in the cloud. For this
- | reason, you may specify a default "cloud" driver here. This driver
- | will be bound as the Cloud disk implementation in the container.
- |
- */
-
- 'cloud' => env('FILESYSTEM_CLOUD', 's3'),
-
/*
|--------------------------------------------------------------------------
| Filesystem Disks
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 00000000..089e4856
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,74 @@
+# For more information: https://laravel.com/docs/sail
+version: '3'
+services:
+ laravel.test:
+ build:
+ context: ./vendor/laravel/sail/runtimes/8.0
+ dockerfile: Dockerfile
+ args:
+ WWWGROUP: '${WWWGROUP}'
+ image: sail-8.0/app
+ ports:
+ - '${APP_PORT:-80}:80'
+ environment:
+ WWWUSER: '${WWWUSER}'
+ LARAVEL_SAIL: 1
+ volumes:
+ - '.:/var/www/html'
+ networks:
+ - sail
+ depends_on:
+ - mysql
+ - redis
+ # - selenium
+ # selenium:
+ # image: 'selenium/standalone-chrome'
+ # volumes:
+ # - '/dev/shm:/dev/shm'
+ # networks:
+ # - sail
+ # depends_on:
+ # - laravel.test
+ mysql:
+ image: 'mysql:8.0'
+ ports:
+ - '${DB_PORT}:3306'
+ environment:
+ MYSQL_ROOT_PASSWORD: '${DB_PASSWORD}'
+ MYSQL_DATABASE: '${DB_DATABASE}'
+ MYSQL_USER: '${DB_USERNAME}'
+ MYSQL_PASSWORD: '${DB_PASSWORD}'
+ MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
+ volumes:
+ - 'sailmysql:/var/lib/mysql'
+ networks:
+ - sail
+ redis:
+ image: 'redis:alpine'
+ ports:
+ - '${REDIS_PORT}:6379'
+ volumes:
+ - 'sailredis:/data'
+ networks:
+ - sail
+ # memcached:
+ # image: 'memcached:alpine'
+ # ports:
+ # - '11211:11211'
+ # networks:
+ # - sail
+ mailhog:
+ image: 'mailhog/mailhog:latest'
+ ports:
+ - 1025:1025
+ - 8025:8025
+ networks:
+ - sail
+networks:
+ sail:
+ driver: bridge
+volumes:
+ sailmysql:
+ driver: local
+ sailredis:
+ driver: local
diff --git a/resources/lang/en/auth.php b/resources/lang/en/auth.php
index e5506df2..6598e2c0 100644
--- a/resources/lang/en/auth.php
+++ b/resources/lang/en/auth.php
@@ -14,6 +14,7 @@ return [
*/
'failed' => 'These credentials do not match our records.',
+ 'password' => 'The provided password is incorrect.',
'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
];
diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php
index ed7110bb..e305e336 100644
--- a/resources/views/welcome.blade.php
+++ b/resources/views/welcome.blade.php
@@ -32,7 +32,7 @@
@if (Route::has('register'))
<a href="{{ route('register') }}" class="ml-4 text-sm text-gray-700 underline">Register</a>
@endif
- @endif
+ @endauth
</div>
@endif