-
Notifications
You must be signed in to change notification settings - Fork 4
/
Copy pathv5.7.13...v5.7.15.diff
216 lines (205 loc) · 6.92 KB
/
v5.7.13...v5.7.15.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
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 80fff51d..59c0c4ea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,9 +12,9 @@
### Changed
- Changed `QUEUE_DRIVER` env variable name to `QUEUE_CONNECTION` ([c30adc8](https://github.com/laravel/laravel/commit/c30adc88c1cf3f30618145c8b698734cbe03b19c))
-- Use seperate cache database for Redis ([#4665](https://github.com/laravel/laravel/pull/4665))
+- Use separate cache database for Redis ([#4665](https://github.com/laravel/laravel/pull/4665))
- Upgrade Lodash to `^4.17.5` ([#4730](https://github.com/laravel/laravel/pull/4730))
-- Changed font to Nuntio from Raleway ([#4727](https://github.com/laravel/laravel/pull/4727))
+- Changed font to `Nunito` from `Raleway` ([#4727](https://github.com/laravel/laravel/pull/4727))
- Defined `mix` as `const` in `webpack.mix.js` ([#4741](https://github.com/laravel/laravel/pull/4741))
- Make Asset Directory Flattened ([ff38d4e](https://github.com/laravel/laravel/commit/ff38d4e1a007c1a7709b5a614da1036adb464b32))
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index 94919620..a3d8c48d 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -65,7 +65,7 @@ class Kernel extends HttpKernel
/**
* The priority-sorted list of middleware.
*
- * This forces the listed middleware to always be in the given order.
+ * This forces non-global middleware to always be in the given order.
*
* @var array
*/
diff --git a/bootstrap/app.php b/bootstrap/app.php
index c65a8600..037e17df 100644
--- a/bootstrap/app.php
+++ b/bootstrap/app.php
@@ -12,7 +12,7 @@
*/
$app = new Illuminate\Foundation\Application(
- dirname(__DIR__)
+ $_ENV['APP_BASE_PATH'] ?? dirname(__DIR__)
);
/*
diff --git a/composer.json b/composer.json
index f587e089..b473a9b7 100644
--- a/composer.json
+++ b/composer.json
@@ -1,9 +1,12 @@
{
"name": "laravel/laravel",
+ "type": "project",
"description": "The Laravel Framework.",
- "keywords": ["framework", "laravel"],
+ "keywords": [
+ "framework",
+ "laravel"
+ ],
"license": "MIT",
- "type": "project",
"require": {
"php": "^7.1.3",
"fideloper/proxy": "^4.0",
@@ -18,43 +21,42 @@
"nunomaduro/collision": "^2.0",
"phpunit/phpunit": "^7.0"
},
+ "config": {
+ "optimize-autoloader": true,
+ "preferred-install": "dist",
+ "sort-packages": true
+ },
+ "extra": {
+ "laravel": {
+ "dont-discover": []
+ }
+ },
"autoload": {
+ "psr-4": {
+ "App\\": "app/"
+ },
"classmap": [
"database/seeds",
"database/factories"
- ],
- "psr-4": {
- "App\\": "app/"
- }
+ ]
},
"autoload-dev": {
"psr-4": {
"Tests\\": "tests/"
}
},
- "extra": {
- "laravel": {
- "dont-discover": [
- ]
- }
- },
+ "minimum-stability": "dev",
+ "prefer-stable": true,
"scripts": {
+ "post-autoload-dump": [
+ "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
+ "@php artisan package:discover --ansi"
+ ],
"post-root-package-install": [
"@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
],
"post-create-project-cmd": [
"@php artisan key:generate --ansi"
- ],
- "post-autoload-dump": [
- "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
- "@php artisan package:discover --ansi"
]
- },
- "config": {
- "preferred-install": "dist",
- "sort-packages": true,
- "optimize-autoloader": true
- },
- "minimum-stability": "dev",
- "prefer-stable": true
+ }
}
diff --git a/config/app.php b/config/app.php
index 01081dca..57ee5b75 100644
--- a/config/app.php
+++ b/config/app.php
@@ -54,6 +54,8 @@ return [
'url' => env('APP_URL', 'http://localhost'),
+ 'asset_url' => env('ASSET_URL', null),
+
/*
|--------------------------------------------------------------------------
| Application Timezone
diff --git a/config/mail.php b/config/mail.php
index bb92224c..f4006459 100644
--- a/config/mail.php
+++ b/config/mail.php
@@ -120,4 +120,17 @@ return [
],
],
+ /*
+ |--------------------------------------------------------------------------
+ | Log Channel
+ |--------------------------------------------------------------------------
+ |
+ | If you are using the "log" driver, you may specify the logging channel
+ | if you prefer to keep mail messages separate from other log entries
+ | for simpler reading. Otherwise, the default channel will be used.
+ |
+ */
+
+ 'log_channel' => env('MAIL_LOG_CHANNEL'),
+
];
diff --git a/config/view.php b/config/view.php
index 2acfd9cc..22b8a18d 100644
--- a/config/view.php
+++ b/config/view.php
@@ -28,6 +28,9 @@ return [
|
*/
- 'compiled' => realpath(storage_path('framework/views')),
+ 'compiled' => env(
+ 'VIEW_COMPILED_PATH',
+ realpath(storage_path('framework/views'))
+ ),
];
diff --git a/readme.md b/readme.md
index 98a3e643..736a2ad3 100644
--- a/readme.md
+++ b/readme.md
@@ -38,6 +38,7 @@ We would like to extend our thanks to the following sponsors for helping fund on
- **[Cubet Techno Labs](https://cubettech.com)**
- **[British Software Development](https://www.britishsoftware.co)**
- **[Webdock, Fast VPS Hosting](https://www.webdock.io/en)**
+- **[DevSquad](https://devsquad.com)**
- [UserInsights](https://userinsights.com)
- [Fragrantica](https://www.fragrantica.com)
- [SOFTonSOFA](https://softonsofa.com/)
diff --git a/resources/js/app.js b/resources/js/app.js
index 543dd59b..24b5dbf7 100644
--- a/resources/js/app.js
+++ b/resources/js/app.js
@@ -20,10 +20,7 @@ window.Vue = require('vue');
Vue.component('example-component', require('./components/ExampleComponent.vue'));
// const files = require.context('./', true, /\.vue$/i)
-
-// files.keys().map(key => {
-// return Vue.component(_.last(key.split('/')).split('.')[0], files(key))
-// })
+// files.keys().map(key => Vue.component(key.split('/').pop().split('.')[0], files(key)))
/**
* Next, we will create a fresh Vue application instance and attach it to
diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php
index 35e5e88d..6c4571c3 100644
--- a/resources/lang/en/validation.php
+++ b/resources/lang/en/validation.php
@@ -32,6 +32,7 @@ return [
'boolean' => 'The :attribute field must be true or false.',
'confirmed' => 'The :attribute confirmation does not match.',
'date' => 'The :attribute is not a valid date.',
+ 'date_equals' => 'The :attribute must be a date equal to :date.',
'date_format' => 'The :attribute does not match the format :format.',
'different' => 'The :attribute and :other must be different.',
'digits' => 'The :attribute must be :digits digits.',