-
Notifications
You must be signed in to change notification settings - Fork 4
/
Copy pathv8.5.0...v8.5.4.diff
84 lines (81 loc) · 2.44 KB
/
v8.5.0...v8.5.4.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
diff --git a/.env.example b/.env.example
index c0502795..68c9578c 100644
--- a/.env.example
+++ b/.env.example
@@ -17,7 +17,7 @@ DB_PASSWORD=
BROADCAST_DRIVER=log
CACHE_DRIVER=file
-QUEUE_CONNECTION=database
+QUEUE_CONNECTION=sync
SESSION_DRIVER=file
SESSION_LIFETIME=120
diff --git a/.gitignore b/.gitignore
index 0f7df0fb..0ae59f0b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@
.env
.env.backup
.phpunit.result.cache
+docker-compose.override.yml
Homestead.json
Homestead.yaml
npm-debug.log
diff --git a/README.md b/README.md
index 2f7ddcc6..e1dcd2e1 100644
--- a/README.md
+++ b/README.md
@@ -42,6 +42,7 @@ We would like to extend our thanks to the following sponsors for funding Laravel
- **[Many](https://www.many.co.uk)**
- **[Webdock, Fast VPS Hosting](https://www.webdock.io/en)**
- **[DevSquad](https://devsquad.com)**
+- **[Curotec](https://www.curotec.com/)**
- **[OP.GG](https://op.gg)**
## Contributing
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index 21a8754b..30020a50 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/composer.json b/composer.json
index 9d06962b..2bc6bbe7 100644
--- a/composer.json
+++ b/composer.json
@@ -18,6 +18,7 @@
"require-dev": {
"facade/ignition": "^2.5",
"fakerphp/faker": "^1.9.1",
+ "laravel/sail": "^0.0.5",
"mockery/mockery": "^1.4.2",
"nunomaduro/collision": "^5.0",
"phpunit/phpunit": "^9.3.3"
diff --git a/docker-compose.yml b/docker-compose.yml
index 089e4856..5ba8e628 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -32,7 +32,7 @@ services:
mysql:
image: 'mysql:8.0'
ports:
- - '${DB_PORT}:3306'
+ - '${FORWARD_DB_PORT:-3306}:3306'
environment:
MYSQL_ROOT_PASSWORD: '${DB_PASSWORD}'
MYSQL_DATABASE: '${DB_DATABASE}'
@@ -46,7 +46,7 @@ services:
redis:
image: 'redis:alpine'
ports:
- - '${REDIS_PORT}:6379'
+ - '${FORWARD_REDIS_PORT:-6379}:6379'
volumes:
- 'sailredis:/data'
networks: