-
Notifications
You must be signed in to change notification settings - Fork 4
/
Copy pathv5.6.7...v5.6.12.diff
96 lines (93 loc) · 3.47 KB
/
v5.6.7...v5.6.12.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
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index 74b1cbdd..3439540c 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -57,6 +57,7 @@ class Kernel extends HttpKernel
'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class,
'can' => \Illuminate\Auth\Middleware\Authorize::class,
'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
+ 'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class,
'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
];
}
diff --git a/composer.json b/composer.json
index 30b15127..65bf8b4f 100644
--- a/composer.json
+++ b/composer.json
@@ -5,18 +5,17 @@
"license": "MIT",
"type": "project",
"require": {
- "php": ">=7.1.3",
- "fideloper/proxy": "~4.0",
+ "php": "^7.1.3",
+ "fideloper/proxy": "^4.0",
"laravel/framework": "5.6.*",
- "laravel/tinker": "~1.0"
+ "laravel/tinker": "^1.0"
},
"require-dev": {
- "filp/whoops": "~2.0",
- "fzaninotto/faker": "~1.4",
- "mockery/mockery": "~1.0",
- "nunomaduro/collision": "~2.0",
- "phpunit/phpunit": "~7.0",
- "symfony/thanks": "^1.0"
+ "filp/whoops": "^2.0",
+ "fzaninotto/faker": "^1.4",
+ "mockery/mockery": "^1.0",
+ "nunomaduro/collision": "^2.0",
+ "phpunit/phpunit": "^7.0"
},
"autoload": {
"classmap": [
diff --git a/config/queue.php b/config/queue.php
index 87b1b1b7..391304f3 100644
--- a/config/queue.php
+++ b/config/queue.php
@@ -4,14 +4,12 @@ return [
/*
|--------------------------------------------------------------------------
- | Default Queue Driver
+ | Default Queue Connection Name
|--------------------------------------------------------------------------
|
| Laravel's queue API supports an assortment of back-ends via a single
| API, giving you convenient access to each back-end using the same
- | syntax for each one. Here you may set the default queue driver.
- |
- | Supported: "sync", "database", "beanstalkd", "sqs", "redis", "null"
+ | syntax for every one. Here you may define a default connection.
|
*/
@@ -26,6 +24,8 @@ return [
| is used by your application. A default configuration has been added
| for each back-end shipped with Laravel. You are free to add more.
|
+ | Drivers: "sync", "database", "beanstalkd", "sqs", "redis", "null"
+ |
*/
'connections' => [
diff --git a/phpunit.xml b/phpunit.xml
index bb9c4a7e..9ee3e734 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -27,5 +27,6 @@
<env name="CACHE_DRIVER" value="array"/>
<env name="SESSION_DRIVER" value="array"/>
<env name="QUEUE_DRIVER" value="sync"/>
+ <env name="MAIL_DRIVER" value="array"/>
</php>
</phpunit>
diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php
index edc036dd..77d23022 100644
--- a/resources/lang/en/validation.php
+++ b/resources/lang/en/validation.php
@@ -65,6 +65,7 @@ return [
'array' => 'The :attribute must have at least :min items.',
],
'not_in' => 'The selected :attribute is invalid.',
+ 'not_regex' => 'The :attribute format is invalid.',
'numeric' => 'The :attribute must be a number.',
'present' => 'The :attribute field must be present.',
'regex' => 'The :attribute format is invalid.',