|
| 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..98ed5f4d 100644 |
| 15 | +--- a/CHANGELOG.md |
| 16 | ++++ b/CHANGELOG.md |
| 17 | +@@ -1,7 +1,21 @@ |
| 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.3...10.x) |
| 22 | + |
| 23 | +-## [v10.0.0 (2022-02-07)](https://github.com/laravel/laravel/compare/v9.5.1...10.x) |
| 24 | ++## [v10.0.3](https://github.com/laravel/laravel/compare/v10.0.2...v10.0.3) - 2023-02-21 |
| 25 | ++ |
| 26 | ++- Remove redundant `@return` docblock in UserFactory by @datlechin in https://github.com/laravel/laravel/pull/6119 |
| 27 | ++- Reverts change in asset helper by @timacdonald in https://github.com/laravel/laravel/pull/6122 |
| 28 | ++ |
| 29 | ++## [v10.0.2](https://github.com/laravel/laravel/compare/v10.0.1...v10.0.2) - 2023-02-16 |
| 30 | ++ |
| 31 | ++- Remove unneeded call by @taylorotwell in https://github.com/laravel/laravel/commit/3986d4c54041fd27af36f96cf11bd79ce7b1ee4e |
| 32 | ++ |
| 33 | ++## [v10.0.1](https://github.com/laravel/laravel/compare/v10.0.0...v10.0.1) - 2023-02-15 |
| 34 | ++ |
| 35 | ++- Add PHPUnit result cache to gitignore by @itxshakil in https://github.com/laravel/laravel/pull/6105 |
| 36 | ++- Allow php-http/discovery as a composer plugin by @nicolas-grekas in https://github.com/laravel/laravel/pull/6106 |
| 37 | ++ |
| 38 | ++## [v10.0.0 (2022-02-14)](https://github.com/laravel/laravel/compare/v9.5.2...v10.0.0) |
| 39 | + |
| 40 | + Laravel 10 includes a variety of changes to the application skeleton. Please consult the diff to see what's new. |
| 41 | +diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php |
| 42 | +index 5522aa2f..dafcbee7 100644 |
| 43 | +--- a/app/Providers/AuthServiceProvider.php |
| 44 | ++++ b/app/Providers/AuthServiceProvider.php |
| 45 | +@@ -21,8 +21,6 @@ class AuthServiceProvider extends ServiceProvider |
| 46 | + */ |
| 47 | + public function boot(): void |
| 48 | + { |
| 49 | +- $this->registerPolicies(); |
| 50 | +- |
| 51 | + // |
| 52 | + } |
| 53 | + } |
| 54 | +diff --git a/composer.json b/composer.json |
| 55 | +index 5b40f87c..4958668f 100644 |
| 56 | +--- a/composer.json |
| 57 | ++++ b/composer.json |
| 58 | +@@ -48,9 +48,6 @@ |
| 59 | + ] |
| 60 | + }, |
| 61 | + "extra": { |
| 62 | +- "branch-alias": { |
| 63 | +- "dev-master": "10.x-dev" |
| 64 | +- }, |
| 65 | + "laravel": { |
| 66 | + "dont-discover": [] |
| 67 | + } |
| 68 | +@@ -60,7 +57,8 @@ |
| 69 | + "preferred-install": "dist", |
| 70 | + "sort-packages": true, |
| 71 | + "allow-plugins": { |
| 72 | +- "pestphp/pest-plugin": true |
| 73 | ++ "pestphp/pest-plugin": true, |
| 74 | ++ "php-http/discovery": true |
| 75 | + } |
| 76 | + }, |
| 77 | + "minimum-stability": "stable", |
| 78 | +diff --git a/config/app.php b/config/app.php |
| 79 | +index bca112fb..ef76a7ed 100644 |
| 80 | +--- a/config/app.php |
| 81 | ++++ b/config/app.php |
| 82 | +@@ -56,7 +56,7 @@ return [ |
| 83 | + |
| 84 | + 'url' => env('APP_URL', 'http://localhost'), |
| 85 | + |
| 86 | +- 'asset_url' => env('ASSET_URL', '/'), |
| 87 | ++ 'asset_url' => env('ASSET_URL'), |
| 88 | + |
| 89 | + /* |
| 90 | + |-------------------------------------------------------------------------- |
| 91 | +diff --git a/config/auth.php b/config/auth.php |
| 92 | +index cae00280..9548c15d 100644 |
| 93 | +--- a/config/auth.php |
| 94 | ++++ b/config/auth.php |
| 95 | +@@ -80,7 +80,7 @@ return [ |
| 96 | + | than one user table or model in the application and you want to have |
| 97 | + | separate password reset settings based on the specific user types. |
| 98 | + | |
| 99 | +- | The expire time is the number of minutes that each reset token will be |
| 100 | ++ | The expiry time is the number of minutes that each reset token will be |
| 101 | + | considered valid. This security feature keeps tokens short-lived so |
| 102 | + | they have less time to be guessed. You may change this as needed. |
| 103 | + | |
| 104 | +diff --git a/config/logging.php b/config/logging.php |
| 105 | +index 5aa1dbb7..4c3df4ce 100644 |
| 106 | +--- a/config/logging.php |
| 107 | ++++ b/config/logging.php |
| 108 | +@@ -102,6 +102,7 @@ return [ |
| 109 | + 'syslog' => [ |
| 110 | + 'driver' => 'syslog', |
| 111 | + 'level' => env('LOG_LEVEL', 'debug'), |
| 112 | ++ 'facility' => LOG_USER, |
| 113 | + ], |
| 114 | + |
| 115 | + 'errorlog' => [ |
| 116 | +diff --git a/config/mail.php b/config/mail.php |
| 117 | +index 049052ff..542d98c3 100644 |
| 118 | +--- a/config/mail.php |
| 119 | ++++ b/config/mail.php |
| 120 | +@@ -28,7 +28,7 @@ return [ |
| 121 | + | sending an e-mail. You will specify which one you are using for your |
| 122 | + | mailers below. You are free to add additional mailers as required. |
| 123 | + | |
| 124 | +- | Supported: "smtp", "sendmail", "mailgun", "ses", |
| 125 | ++ | Supported: "smtp", "sendmail", "mailgun", "ses", "ses-v2", |
| 126 | + | "postmark", "log", "array", "failover" |
| 127 | + | |
| 128 | + */ |
| 129 | +diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php |
| 130 | +index d4e88356..a6ecc0af 100644 |
| 131 | +--- a/database/factories/UserFactory.php |
| 132 | ++++ b/database/factories/UserFactory.php |
| 133 | +@@ -28,8 +28,6 @@ class UserFactory extends Factory |
| 134 | + |
| 135 | + /** |
| 136 | + * Indicate that the model's email address should be unverified. |
| 137 | +- * |
| 138 | +- * @return $this |
| 139 | + */ |
| 140 | + public function unverified(): static |
| 141 | + { |
0 commit comments