-
Notifications
You must be signed in to change notification settings - Fork 4
/
Copy pathv10.0.5...v10.0.7.diff
91 lines (86 loc) · 2.99 KB
/
v10.0.5...v10.0.7.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
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 97af4b2c..173a8721 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,14 @@
# Release Notes
-## [Unreleased](https://github.com/laravel/laravel/compare/v10.0.4...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
diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php
index bc491099..0c18923b 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.
*
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/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/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"/>