-
Notifications
You must be signed in to change notification settings - Fork 4
/
Copy pathv8.4.3...v8.5.1.diff
187 lines (179 loc) · 5.53 KB
/
v8.4.3...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
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 80d51eb7..195610f2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,16 @@
# Release Notes
-## [Unreleased](https://github.com/laravel/laravel/compare/v8.4.3...8.x)
+## [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)
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/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