|
| 1 | +diff --git a/.gitignore b/.gitignore |
| 2 | +index e6bbd7ae..7fe978f8 100644 |
| 3 | +--- a/.gitignore |
| 4 | ++++ b/.gitignore |
| 5 | +@@ -8,6 +8,7 @@ |
| 6 | + .env |
| 7 | + .env.backup |
| 8 | + .env.production |
| 9 | ++.phpunit.result.cache |
| 10 | + Homestead.json |
| 11 | + Homestead.yaml |
| 12 | + auth.json |
| 13 | +diff --git a/CHANGELOG.md b/CHANGELOG.md |
| 14 | +index a08dfc8a..5b65b6f4 100644 |
| 15 | +--- a/CHANGELOG.md |
| 16 | ++++ b/CHANGELOG.md |
| 17 | +@@ -1,7 +1,30 @@ |
| 18 | + # Release Notes |
| 19 | + |
| 20 | +-## [Unreleased](https://github.com/laravel/laravel/compare/v9.5.1...10.x) |
| 21 | ++## [Unreleased](https://github.com/laravel/laravel/compare/v10.0.5...10.x) |
| 22 | + |
| 23 | +-## [v10.0.0 (2022-02-07)](https://github.com/laravel/laravel/compare/v9.5.1...10.x) |
| 24 | ++## [v10.0.5](https://github.com/laravel/laravel/compare/v10.0.4...v10.0.5) - 2023-03-08 |
| 25 | ++ |
| 26 | ++- Add replace_placeholders to log channels by @alanpoulain in https://github.com/laravel/laravel/pull/6139 |
| 27 | ++ |
| 28 | ++## [v10.0.4](https://github.com/laravel/laravel/compare/v10.0.3...v10.0.4) - 2023-02-27 |
| 29 | ++ |
| 30 | ++- Fix typo by @izzudin96 in https://github.com/laravel/laravel/pull/6128 |
| 31 | ++- Specify facility in the syslog driver config by @nicolus in https://github.com/laravel/laravel/pull/6130 |
| 32 | ++ |
| 33 | ++## [v10.0.3](https://github.com/laravel/laravel/compare/v10.0.2...v10.0.3) - 2023-02-21 |
| 34 | ++ |
| 35 | ++- Remove redundant `@return` docblock in UserFactory by @datlechin in https://github.com/laravel/laravel/pull/6119 |
| 36 | ++- Reverts change in asset helper by @timacdonald in https://github.com/laravel/laravel/pull/6122 |
| 37 | ++ |
| 38 | ++## [v10.0.2](https://github.com/laravel/laravel/compare/v10.0.1...v10.0.2) - 2023-02-16 |
| 39 | ++ |
| 40 | ++- Remove unneeded call by @taylorotwell in https://github.com/laravel/laravel/commit/3986d4c54041fd27af36f96cf11bd79ce7b1ee4e |
| 41 | ++ |
| 42 | ++## [v10.0.1](https://github.com/laravel/laravel/compare/v10.0.0...v10.0.1) - 2023-02-15 |
| 43 | ++ |
| 44 | ++- Add PHPUnit result cache to gitignore by @itxshakil in https://github.com/laravel/laravel/pull/6105 |
| 45 | ++- Allow php-http/discovery as a composer plugin by @nicolas-grekas in https://github.com/laravel/laravel/pull/6106 |
| 46 | ++ |
| 47 | ++## [v10.0.0 (2022-02-14)](https://github.com/laravel/laravel/compare/v9.5.2...v10.0.0) |
| 48 | + |
| 49 | + Laravel 10 includes a variety of changes to the application skeleton. Please consult the diff to see what's new. |
| 50 | +diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php |
| 51 | +index 5522aa2f..dafcbee7 100644 |
| 52 | +--- a/app/Providers/AuthServiceProvider.php |
| 53 | ++++ b/app/Providers/AuthServiceProvider.php |
| 54 | +@@ -21,8 +21,6 @@ class AuthServiceProvider extends ServiceProvider |
| 55 | + */ |
| 56 | + public function boot(): void |
| 57 | + { |
| 58 | +- $this->registerPolicies(); |
| 59 | +- |
| 60 | + // |
| 61 | + } |
| 62 | + } |
| 63 | +diff --git a/composer.json b/composer.json |
| 64 | +index 5b40f87c..4958668f 100644 |
| 65 | +--- a/composer.json |
| 66 | ++++ b/composer.json |
| 67 | +@@ -48,9 +48,6 @@ |
| 68 | + ] |
| 69 | + }, |
| 70 | + "extra": { |
| 71 | +- "branch-alias": { |
| 72 | +- "dev-master": "10.x-dev" |
| 73 | +- }, |
| 74 | + "laravel": { |
| 75 | + "dont-discover": [] |
| 76 | + } |
| 77 | +@@ -60,7 +57,8 @@ |
| 78 | + "preferred-install": "dist", |
| 79 | + "sort-packages": true, |
| 80 | + "allow-plugins": { |
| 81 | +- "pestphp/pest-plugin": true |
| 82 | ++ "pestphp/pest-plugin": true, |
| 83 | ++ "php-http/discovery": true |
| 84 | + } |
| 85 | + }, |
| 86 | + "minimum-stability": "stable", |
| 87 | +diff --git a/config/app.php b/config/app.php |
| 88 | +index bca112fb..ef76a7ed 100644 |
| 89 | +--- a/config/app.php |
| 90 | ++++ b/config/app.php |
| 91 | +@@ -56,7 +56,7 @@ return [ |
| 92 | + |
| 93 | + 'url' => env('APP_URL', 'http://localhost'), |
| 94 | + |
| 95 | +- 'asset_url' => env('ASSET_URL', '/'), |
| 96 | ++ 'asset_url' => env('ASSET_URL'), |
| 97 | + |
| 98 | + /* |
| 99 | + |-------------------------------------------------------------------------- |
| 100 | +diff --git a/config/auth.php b/config/auth.php |
| 101 | +index cae00280..9548c15d 100644 |
| 102 | +--- a/config/auth.php |
| 103 | ++++ b/config/auth.php |
| 104 | +@@ -80,7 +80,7 @@ return [ |
| 105 | + | than one user table or model in the application and you want to have |
| 106 | + | separate password reset settings based on the specific user types. |
| 107 | + | |
| 108 | +- | The expire time is the number of minutes that each reset token will be |
| 109 | ++ | The expiry time is the number of minutes that each reset token will be |
| 110 | + | considered valid. This security feature keeps tokens short-lived so |
| 111 | + | they have less time to be guessed. You may change this as needed. |
| 112 | + | |
| 113 | +diff --git a/config/logging.php b/config/logging.php |
| 114 | +index 5aa1dbb7..c44d2763 100644 |
| 115 | +--- a/config/logging.php |
| 116 | ++++ b/config/logging.php |
| 117 | +@@ -3,6 +3,7 @@ |
| 118 | + use Monolog\Handler\NullHandler; |
| 119 | + use Monolog\Handler\StreamHandler; |
| 120 | + use Monolog\Handler\SyslogUdpHandler; |
| 121 | ++use Monolog\Processor\PsrLogMessageProcessor; |
| 122 | + |
| 123 | + return [ |
| 124 | + |
| 125 | +@@ -61,6 +62,7 @@ return [ |
| 126 | + 'driver' => 'single', |
| 127 | + 'path' => storage_path('logs/laravel.log'), |
| 128 | + 'level' => env('LOG_LEVEL', 'debug'), |
| 129 | ++ 'replace_placeholders' => true, |
| 130 | + ], |
| 131 | + |
| 132 | + 'daily' => [ |
| 133 | +@@ -68,6 +70,7 @@ return [ |
| 134 | + 'path' => storage_path('logs/laravel.log'), |
| 135 | + 'level' => env('LOG_LEVEL', 'debug'), |
| 136 | + 'days' => 14, |
| 137 | ++ 'replace_placeholders' => true, |
| 138 | + ], |
| 139 | + |
| 140 | + 'slack' => [ |
| 141 | +@@ -76,6 +79,7 @@ return [ |
| 142 | + 'username' => 'Laravel Log', |
| 143 | + 'emoji' => ':boom:', |
| 144 | + 'level' => env('LOG_LEVEL', 'critical'), |
| 145 | ++ 'replace_placeholders' => true, |
| 146 | + ], |
| 147 | + |
| 148 | + 'papertrail' => [ |
| 149 | +@@ -87,6 +91,7 @@ return [ |
| 150 | + 'port' => env('PAPERTRAIL_PORT'), |
| 151 | + 'connectionString' => 'tls://'.env('PAPERTRAIL_URL').':'.env('PAPERTRAIL_PORT'), |
| 152 | + ], |
| 153 | ++ 'processors' => [PsrLogMessageProcessor::class], |
| 154 | + ], |
| 155 | + |
| 156 | + 'stderr' => [ |
| 157 | +@@ -97,16 +102,20 @@ return [ |
| 158 | + 'with' => [ |
| 159 | + 'stream' => 'php://stderr', |
| 160 | + ], |
| 161 | ++ 'processors' => [PsrLogMessageProcessor::class], |
| 162 | + ], |
| 163 | + |
| 164 | + 'syslog' => [ |
| 165 | + 'driver' => 'syslog', |
| 166 | + 'level' => env('LOG_LEVEL', 'debug'), |
| 167 | ++ 'facility' => LOG_USER, |
| 168 | ++ 'replace_placeholders' => true, |
| 169 | + ], |
| 170 | + |
| 171 | + 'errorlog' => [ |
| 172 | + 'driver' => 'errorlog', |
| 173 | + 'level' => env('LOG_LEVEL', 'debug'), |
| 174 | ++ 'replace_placeholders' => true, |
| 175 | + ], |
| 176 | + |
| 177 | + 'null' => [ |
| 178 | +diff --git a/config/mail.php b/config/mail.php |
| 179 | +index 049052ff..542d98c3 100644 |
| 180 | +--- a/config/mail.php |
| 181 | ++++ b/config/mail.php |
| 182 | +@@ -28,7 +28,7 @@ return [ |
| 183 | + | sending an e-mail. You will specify which one you are using for your |
| 184 | + | mailers below. You are free to add additional mailers as required. |
| 185 | + | |
| 186 | +- | Supported: "smtp", "sendmail", "mailgun", "ses", |
| 187 | ++ | Supported: "smtp", "sendmail", "mailgun", "ses", "ses-v2", |
| 188 | + | "postmark", "log", "array", "failover" |
| 189 | + | |
| 190 | + */ |
| 191 | +diff --git a/config/queue.php b/config/queue.php |
| 192 | +index 25ea5a81..01c6b054 100644 |
| 193 | +--- a/config/queue.php |
| 194 | ++++ b/config/queue.php |
| 195 | +@@ -73,6 +73,22 @@ return [ |
| 196 | + |
| 197 | + ], |
| 198 | + |
| 199 | ++ /* |
| 200 | ++ |-------------------------------------------------------------------------- |
| 201 | ++ | Job Batching |
| 202 | ++ |-------------------------------------------------------------------------- |
| 203 | ++ | |
| 204 | ++ | The following options configure the database and table that store job |
| 205 | ++ | batching information. These options can be updated to any database |
| 206 | ++ | connection and table which has been defined by your application. |
| 207 | ++ | |
| 208 | ++ */ |
| 209 | ++ |
| 210 | ++ 'batching' => [ |
| 211 | ++ 'database' => env('DB_CONNECTION', 'mysql'), |
| 212 | ++ 'table' => 'job_batches', |
| 213 | ++ ], |
| 214 | ++ |
| 215 | + /* |
| 216 | + |-------------------------------------------------------------------------- |
| 217 | + | Failed Queue Jobs |
| 218 | +diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php |
| 219 | +index d4e88356..a6ecc0af 100644 |
| 220 | +--- a/database/factories/UserFactory.php |
| 221 | ++++ b/database/factories/UserFactory.php |
| 222 | +@@ -28,8 +28,6 @@ class UserFactory extends Factory |
| 223 | + |
| 224 | + /** |
| 225 | + * Indicate that the model's email address should be unverified. |
| 226 | +- * |
| 227 | +- * @return $this |
| 228 | + */ |
| 229 | + public function unverified(): static |
| 230 | + { |
0 commit comments