-
Notifications
You must be signed in to change notification settings - Fork 4
/
Copy pathv10.0.2...v10.1.0.diff
386 lines (359 loc) · 12.7 KB
/
v10.0.2...v10.1.0.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
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
diff --git a/.gitignore b/.gitignore
index 3cb7c776..7fe978f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,12 +8,12 @@
.env
.env.backup
.env.production
+.phpunit.result.cache
Homestead.json
Homestead.yaml
auth.json
npm-debug.log
yarn-error.log
-.phpunit.result.cache
/.fleet
/.idea
/.vscode
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8c536600..173a8721 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,28 @@
# Release Notes
-## [Unreleased](https://github.com/laravel/laravel/compare/v10.0.1...10.x)
+## [Unreleased](https://github.com/laravel/laravel/compare/v10.0.6...10.x)
+
+## [v10.0.6](https://github.com/laravel/laravel/compare/v10.0.5...v10.0.6) - 2023-04-05
+
+- Add job batching options to Queue configuration file by @AnOlsen in https://github.com/laravel/laravel/pull/6149
+
+## [v10.0.5](https://github.com/laravel/laravel/compare/v10.0.4...v10.0.5) - 2023-03-08
+
+- Add replace_placeholders to log channels by @alanpoulain in https://github.com/laravel/laravel/pull/6139
+
+## [v10.0.4](https://github.com/laravel/laravel/compare/v10.0.3...v10.0.4) - 2023-02-27
+
+- Fix typo by @izzudin96 in https://github.com/laravel/laravel/pull/6128
+- Specify facility in the syslog driver config by @nicolus in https://github.com/laravel/laravel/pull/6130
+
+## [v10.0.3](https://github.com/laravel/laravel/compare/v10.0.2...v10.0.3) - 2023-02-21
+
+- Remove redundant `@return` docblock in UserFactory by @datlechin in https://github.com/laravel/laravel/pull/6119
+- Reverts change in asset helper by @timacdonald in https://github.com/laravel/laravel/pull/6122
+
+## [v10.0.2](https://github.com/laravel/laravel/compare/v10.0.1...v10.0.2) - 2023-02-16
+
+- Remove unneeded call by @taylorotwell in https://github.com/laravel/laravel/commit/3986d4c54041fd27af36f96cf11bd79ce7b1ee4e
## [v10.0.1](https://github.com/laravel/laravel/compare/v10.0.0...v10.0.1) - 2023-02-15
diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
index b1c262c6..56af2640 100644
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -8,25 +8,7 @@ use Throwable;
class Handler extends ExceptionHandler
{
/**
- * A list of exception types with their corresponding custom log levels.
- *
- * @var array<class-string<\Throwable>, \Psr\Log\LogLevel::*>
- */
- protected $levels = [
- //
- ];
-
- /**
- * A list of the exception types that are not reported.
- *
- * @var array<int, class-string<\Throwable>>
- */
- protected $dontReport = [
- //
- ];
-
- /**
- * A list of the inputs that are never flashed to the session on validation exceptions.
+ * The list of the inputs that are never flashed to the session on validation exceptions.
*
* @var array<int, string>
*/
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index c34cdcf1..1fb53dce 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -48,7 +48,7 @@ class Kernel extends HttpKernel
/**
* The application's middleware aliases.
*
- * Aliases may be used to conveniently assign middleware to routes and groups.
+ * Aliases may be used instead of class names to conveniently assign middleware to routes and groups.
*
* @var array<string, class-string|string>
*/
diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php
index dafcbee7..54756cd1 100644
--- a/app/Providers/AuthServiceProvider.php
+++ b/app/Providers/AuthServiceProvider.php
@@ -13,7 +13,7 @@ class AuthServiceProvider extends ServiceProvider
* @var array<class-string, class-string>
*/
protected $policies = [
- // 'App\Models\Model' => 'App\Policies\ModelPolicy',
+ //
];
/**
diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php
index bc491099..1cf5f15c 100644
--- a/app/Providers/RouteServiceProvider.php
+++ b/app/Providers/RouteServiceProvider.php
@@ -11,7 +11,7 @@ use Illuminate\Support\Facades\Route;
class RouteServiceProvider extends ServiceProvider
{
/**
- * The path to the "home" route for your application.
+ * The path to your application's "home" route.
*
* Typically, users are redirected here after authentication.
*
@@ -24,7 +24,9 @@ class RouteServiceProvider extends ServiceProvider
*/
public function boot(): void
{
- $this->configureRateLimiting();
+ RateLimiter::for('api', function (Request $request) {
+ return Limit::perMinute(60)->by($request->user()?->id ?: $request->ip());
+ });
$this->routes(function () {
Route::middleware('api')
@@ -35,14 +37,4 @@ class RouteServiceProvider extends ServiceProvider
->group(base_path('routes/web.php'));
});
}
-
- /**
- * Configure the rate limiters for the application.
- */
- protected function configureRateLimiting(): void
- {
- RateLimiter::for('api', function (Request $request) {
- return Limit::perMinute(60)->by($request->user()?->id ?: $request->ip());
- });
- }
}
diff --git a/composer.json b/composer.json
index 4958668f..4a1a7cda 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
"laravel/sail": "^1.18",
"mockery/mockery": "^1.4.4",
"nunomaduro/collision": "^7.0",
- "phpunit/phpunit": "^10.0",
+ "phpunit/phpunit": "^10.1",
"spatie/laravel-ignition": "^2.0"
},
"autoload": {
diff --git a/config/app.php b/config/app.php
index bca112fb..4c231b47 100644
--- a/config/app.php
+++ b/config/app.php
@@ -1,6 +1,7 @@
<?php
use Illuminate\Support\Facades\Facade;
+use Illuminate\Support\ServiceProvider;
return [
@@ -56,7 +57,7 @@ return [
'url' => env('APP_URL', 'http://localhost'),
- 'asset_url' => env('ASSET_URL', '/'),
+ 'asset_url' => env('ASSET_URL'),
/*
|--------------------------------------------------------------------------
@@ -154,34 +155,7 @@ return [
|
*/
- 'providers' => [
-
- /*
- * Laravel Framework Service Providers...
- */
- Illuminate\Auth\AuthServiceProvider::class,
- Illuminate\Broadcasting\BroadcastServiceProvider::class,
- Illuminate\Bus\BusServiceProvider::class,
- Illuminate\Cache\CacheServiceProvider::class,
- Illuminate\Foundation\Providers\ConsoleSupportServiceProvider::class,
- Illuminate\Cookie\CookieServiceProvider::class,
- Illuminate\Database\DatabaseServiceProvider::class,
- Illuminate\Encryption\EncryptionServiceProvider::class,
- Illuminate\Filesystem\FilesystemServiceProvider::class,
- Illuminate\Foundation\Providers\FoundationServiceProvider::class,
- Illuminate\Hashing\HashServiceProvider::class,
- Illuminate\Mail\MailServiceProvider::class,
- Illuminate\Notifications\NotificationServiceProvider::class,
- Illuminate\Pagination\PaginationServiceProvider::class,
- Illuminate\Pipeline\PipelineServiceProvider::class,
- Illuminate\Queue\QueueServiceProvider::class,
- Illuminate\Redis\RedisServiceProvider::class,
- Illuminate\Auth\Passwords\PasswordResetServiceProvider::class,
- Illuminate\Session\SessionServiceProvider::class,
- Illuminate\Translation\TranslationServiceProvider::class,
- Illuminate\Validation\ValidationServiceProvider::class,
- Illuminate\View\ViewServiceProvider::class,
-
+ 'providers' => ServiceProvider::defaultProviders()->merge([
/*
* Package Service Providers...
*/
@@ -194,8 +168,7 @@ return [
// App\Providers\BroadcastServiceProvider::class,
App\Providers\EventServiceProvider::class,
App\Providers\RouteServiceProvider::class,
-
- ],
+ ])->toArray(),
/*
|--------------------------------------------------------------------------
@@ -209,7 +182,7 @@ return [
*/
'aliases' => Facade::defaultAliases()->merge([
- // 'ExampleClass' => App\Example\ExampleClass::class,
+ // 'Example' => App\Facades\Example::class,
])->toArray(),
];
diff --git a/config/auth.php b/config/auth.php
index cae00280..9548c15d 100644
--- a/config/auth.php
+++ b/config/auth.php
@@ -80,7 +80,7 @@ return [
| than one user table or model in the application and you want to have
| separate password reset settings based on the specific user types.
|
- | The expire time is the number of minutes that each reset token will be
+ | The expiry time is the number of minutes that each reset token will be
| considered valid. This security feature keeps tokens short-lived so
| they have less time to be guessed. You may change this as needed.
|
diff --git a/config/logging.php b/config/logging.php
index 5aa1dbb7..c44d2763 100644
--- a/config/logging.php
+++ b/config/logging.php
@@ -3,6 +3,7 @@
use Monolog\Handler\NullHandler;
use Monolog\Handler\StreamHandler;
use Monolog\Handler\SyslogUdpHandler;
+use Monolog\Processor\PsrLogMessageProcessor;
return [
@@ -61,6 +62,7 @@ return [
'driver' => 'single',
'path' => storage_path('logs/laravel.log'),
'level' => env('LOG_LEVEL', 'debug'),
+ 'replace_placeholders' => true,
],
'daily' => [
@@ -68,6 +70,7 @@ return [
'path' => storage_path('logs/laravel.log'),
'level' => env('LOG_LEVEL', 'debug'),
'days' => 14,
+ 'replace_placeholders' => true,
],
'slack' => [
@@ -76,6 +79,7 @@ return [
'username' => 'Laravel Log',
'emoji' => ':boom:',
'level' => env('LOG_LEVEL', 'critical'),
+ 'replace_placeholders' => true,
],
'papertrail' => [
@@ -87,6 +91,7 @@ return [
'port' => env('PAPERTRAIL_PORT'),
'connectionString' => 'tls://'.env('PAPERTRAIL_URL').':'.env('PAPERTRAIL_PORT'),
],
+ 'processors' => [PsrLogMessageProcessor::class],
],
'stderr' => [
@@ -97,16 +102,20 @@ return [
'with' => [
'stream' => 'php://stderr',
],
+ 'processors' => [PsrLogMessageProcessor::class],
],
'syslog' => [
'driver' => 'syslog',
'level' => env('LOG_LEVEL', 'debug'),
+ 'facility' => LOG_USER,
+ 'replace_placeholders' => true,
],
'errorlog' => [
'driver' => 'errorlog',
'level' => env('LOG_LEVEL', 'debug'),
+ 'replace_placeholders' => true,
],
'null' => [
diff --git a/config/mail.php b/config/mail.php
index 275a3c64..542d98c3 100644
--- a/config/mail.php
+++ b/config/mail.php
@@ -28,7 +28,7 @@ return [
| sending an e-mail. You will specify which one you are using for your
| mailers below. You are free to add additional mailers as required.
|
- | Supported: "smtp", "sendmail", "mailgun", "ses", "ses-v2"
+ | Supported: "smtp", "sendmail", "mailgun", "ses", "ses-v2",
| "postmark", "log", "array", "failover"
|
*/
diff --git a/config/queue.php b/config/queue.php
index 25ea5a81..01c6b054 100644
--- a/config/queue.php
+++ b/config/queue.php
@@ -73,6 +73,22 @@ return [
],
+ /*
+ |--------------------------------------------------------------------------
+ | Job Batching
+ |--------------------------------------------------------------------------
+ |
+ | The following options configure the database and table that store job
+ | batching information. These options can be updated to any database
+ | connection and table which has been defined by your application.
+ |
+ */
+
+ 'batching' => [
+ 'database' => env('DB_CONNECTION', 'mysql'),
+ 'table' => 'job_batches',
+ ],
+
/*
|--------------------------------------------------------------------------
| Failed Queue Jobs
diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php
index d4e88356..a6ecc0af 100644
--- a/database/factories/UserFactory.php
+++ b/database/factories/UserFactory.php
@@ -28,8 +28,6 @@ class UserFactory extends Factory
/**
* Indicate that the model's email address should be unverified.
- *
- * @return $this
*/
public function unverified(): static
{
diff --git a/phpunit.xml b/phpunit.xml
index eb13aff1..e9f533da 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -12,11 +12,11 @@
<directory suffix="Test.php">./tests/Feature</directory>
</testsuite>
</testsuites>
- <coverage>
+ <source>
<include>
<directory suffix=".php">./app</directory>
</include>
- </coverage>
+ </source>
<php>
<env name="APP_ENV" value="testing"/>
<env name="BCRYPT_ROUNDS" value="4"/>