From c088b3b7655fd2bc8c53d883f90f53e65bacc3e7 Mon Sep 17 00:00:00 2001 From: Raj Siva-Rajah <5361908+binaryfire@users.noreply.github.com> Date: Fri, 15 Sep 2023 22:48:41 +0930 Subject: [PATCH 01/17] Fix incorrect collation for MySQL 8 (#6239) --- config/database.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/database.php b/config/database.php index 137ad18c..9d202c36 100644 --- a/config/database.php +++ b/config/database.php @@ -53,7 +53,7 @@ return [ 'password' => env('DB_PASSWORD', ''), 'unix_socket' => env('DB_SOCKET', ''), 'charset' => 'utf8mb4', - 'collation' => 'utf8mb4_unicode_ci', + 'collation' => 'utf8mb4_0900_ai_ci', 'prefix' => '', 'prefix_indexes' => true, 'strict' => true, From 96d3ecf5c26577530306374eb8e164fdc7425978 Mon Sep 17 00:00:00 2001 From: Julius Kiekbusch Date: Sat, 16 Sep 2023 00:29:57 +0200 Subject: [PATCH 02/17] Revert "Fix incorrect collation for MySQL 8 (#6239)" (#6240) This reverts commit c088b3b7655fd2bc8c53d883f90f53e65bacc3e7. --- config/database.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/database.php b/config/database.php index 9d202c36..137ad18c 100644 --- a/config/database.php +++ b/config/database.php @@ -53,7 +53,7 @@ return [ 'password' => env('DB_PASSWORD', ''), 'unix_socket' => env('DB_SOCKET', ''), 'charset' => 'utf8mb4', - 'collation' => 'utf8mb4_0900_ai_ci', + 'collation' => 'utf8mb4_unicode_ci', 'prefix' => '', 'prefix_indexes' => true, 'strict' => true, From 74c5a01b09b24950cfcffbbc3bad9c2749f7388b Mon Sep 17 00:00:00 2001 From: Julius Kiekbusch Date: Tue, 19 Sep 2023 16:15:38 +0200 Subject: [PATCH 03/17] Let database handle default collation (#6241) --- config/database.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/database.php b/config/database.php index 137ad18c..8cd8ed07 100644 --- a/config/database.php +++ b/config/database.php @@ -53,7 +53,7 @@ return [ 'password' => env('DB_PASSWORD', ''), 'unix_socket' => env('DB_SOCKET', ''), 'charset' => 'utf8mb4', - 'collation' => 'utf8mb4_unicode_ci', + 'collation' => null, 'prefix' => '', 'prefix_indexes' => true, 'strict' => true, From 88695a7cf4b1fb2a248d129f8b53400ec65ddf8f Mon Sep 17 00:00:00 2001 From: Julius Kiekbusch Date: Wed, 20 Sep 2023 15:58:12 +0200 Subject: [PATCH 04/17] Add PHP 8.3 to Tests Matrix (#6244) --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 8e6e9cd5..ebcd6854 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -19,7 +19,7 @@ jobs: strategy: fail-fast: true matrix: - php: [8.1, 8.2] + php: [8.1, 8.2, 8.3] name: PHP ${{ matrix.php }} From 540cec038fe3b2ae6859e0f26d12caf839082d03 Mon Sep 17 00:00:00 2001 From: Stephen Rees-Carter Date: Sat, 23 Sep 2023 01:06:29 +1000 Subject: [PATCH 05/17] Increase bcrypt rounds to 12 (#6245) --- config/hashing.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/hashing.php b/config/hashing.php index bcd3be4c..ae44a3e8 100644 --- a/config/hashing.php +++ b/config/hashing.php @@ -29,7 +29,7 @@ return [ */ 'bcrypt' => [ - 'rounds' => env('BCRYPT_ROUNDS', 10), + 'rounds' => env('BCRYPT_ROUNDS', 12), ], /* From 8e5f0e5d00c2398da45404fdcd052c9518a4622f Mon Sep 17 00:00:00 2001 From: Julius Kiekbusch Date: Fri, 22 Sep 2023 20:03:48 +0200 Subject: [PATCH 06/17] Use 12 bcrypt rounds for password in UserFactory (#6247) --- database/factories/UserFactory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php index a6ecc0af..cf0be25d 100644 --- a/database/factories/UserFactory.php +++ b/database/factories/UserFactory.php @@ -21,7 +21,7 @@ class UserFactory extends Factory 'name' => fake()->name(), 'email' => fake()->unique()->safeEmail(), 'email_verified_at' => now(), - 'password' => '$2y$10$92IXUNpkjO0rOQ5byMi.Ye4oKoEa3Ro9llC/.og/at2.uheWG/igi', // password + 'password' => '$2y$12$Z/vhVO3e.UXKaG11EWgxc.EL7uej3Pi1M0Pq0orF5cbFGtyVh0V3C', // password 'remember_token' => Str::random(10), ]; } From 78243dda899443d478e2a555f8c94d023a2db633 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Mon, 25 Sep 2023 16:29:45 -0500 Subject: [PATCH 07/17] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3ed385a7..6c59e214 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ If you don't feel like reading, [Laracasts](https://laracasts.com) can help. Lar ## Laravel Sponsors -We would like to extend our thanks to the following sponsors for funding Laravel development. If you are interested in becoming a sponsor, please visit the Laravel [Patreon page](https://patreon.com/taylorotwell). +We would like to extend our thanks to the following sponsors for funding Laravel development. If you are interested in becoming a sponsor, please visit the [Laravel Partners program](https://partners.laravel.com). ### Premium Partners From 960ea7b325e3ec43c8e795da307f354e61941a66 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Mon, 25 Sep 2023 16:38:15 -0500 Subject: [PATCH 08/17] Update README.md --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 6c59e214..1824fc1b 100644 --- a/README.md +++ b/README.md @@ -37,17 +37,17 @@ We would like to extend our thanks to the following sponsors for funding Laravel - **[Vehikl](https://vehikl.com/)** - **[Tighten Co.](https://tighten.co)** +- **[WebReinvent](https://webreinvent.com/)** - **[Kirschbaum Development Group](https://kirschbaumdevelopment.com)** - **[64 Robots](https://64robots.com)** -- **[Cubet Techno Labs](https://cubettech.com)** -- **[Cyber-Duck](https://cyber-duck.co.uk)** -- **[Many](https://www.many.co.uk)** -- **[Webdock, Fast VPS Hosting](https://www.webdock.io/en)** -- **[DevSquad](https://devsquad.com)** - **[Curotec](https://www.curotec.com/services/technologies/laravel/)** +- **[Cyber-Duck](https://cyber-duck.co.uk)** +- **[DevSquad](https://devsquad.com/hire-laravel-developers)** +- **[Jump24](https://jump24.co.uk)** +- **[Redberry](https://redberry.international/laravel/)** +- **[Active Logic](https://activelogic.com)** +- **[byte5](https://byte5.de)** - **[OP.GG](https://op.gg)** -- **[WebReinvent](https://webreinvent.com/?utm_source=laravel&utm_medium=github&utm_campaign=patreon-sponsors)** -- **[Lendio](https://lendio.com)** ## Contributing From 25070a3ffb175c15b59cd7f12289a9648165bba3 Mon Sep 17 00:00:00 2001 From: Martin Bastien Date: Tue, 26 Sep 2023 21:37:09 -0400 Subject: [PATCH 09/17] Fix typo in the comment for token prefix (sanctum config) (#6248) --- config/sanctum.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/sanctum.php b/config/sanctum.php index e739e96e..35d75b31 100644 --- a/config/sanctum.php +++ b/config/sanctum.php @@ -53,9 +53,9 @@ return [ | Token Prefix |-------------------------------------------------------------------------- | - | Sanctum can prefix new tokens in order to take advantage of various - | security scanning initiaives maintained by open source platforms - | that alert developers if they commit tokens into repositories. + | Sanctum can prefix new tokens in order to take advantage of numerous + | security scanning initiatives maintained by open source platforms + | that notify developers if they commit tokens into repositories. | | See: https://docs.github.com/en/code-security/secret-scanning/about-secret-scanning | From 036ea83da2afba28163a1f959a227cda7bd14a88 Mon Sep 17 00:00:00 2001 From: Nuno Maduro Date: Tue, 17 Oct 2023 14:17:21 +0100 Subject: [PATCH 10/17] Uses `actions/checkout@v4` --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index ebcd6854..0e0c54ec 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -25,7 +25,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup PHP uses: shivammathur/setup-php@v2 From 7fe97a165af1b480eed172e7f38c1ca8de7eb2ff Mon Sep 17 00:00:00 2001 From: Tim MacDonald Date: Wed, 25 Oct 2023 01:11:07 +1100 Subject: [PATCH 11/17] [10.x] Update fixture hash to match testing cost (#6259) * Update fixture hash to match testing cost * Conditionally use lower cost in tests * use hash facade and memoize * remove import --------- Co-authored-by: Taylor Otwell --- database/factories/UserFactory.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php index cf0be25d..cde014af 100644 --- a/database/factories/UserFactory.php +++ b/database/factories/UserFactory.php @@ -3,6 +3,7 @@ namespace Database\Factories; use Illuminate\Database\Eloquent\Factories\Factory; +use Illuminate\Support\Facades\Hash; use Illuminate\Support\Str; /** @@ -10,6 +11,8 @@ use Illuminate\Support\Str; */ class UserFactory extends Factory { + protected static ?string $password; + /** * Define the model's default state. * @@ -21,7 +24,7 @@ class UserFactory extends Factory 'name' => fake()->name(), 'email' => fake()->unique()->safeEmail(), 'email_verified_at' => now(), - 'password' => '$2y$12$Z/vhVO3e.UXKaG11EWgxc.EL7uej3Pi1M0Pq0orF5cbFGtyVh0V3C', // password + 'password' => static::$password ??= Hash::make('password'), 'remember_token' => Str::random(10), ]; } From b0b29e12963d286daaaa5f182d0471aa04fbcd79 Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Wed, 25 Oct 2023 22:29:35 +0800 Subject: [PATCH 12/17] [10.x] Update minimum `laravel/sanctum` (#6261) PR #6234 updated the configuration but it depends on Sanctum 3.3. This PR avoids installing Sanctum 3.2 with the new config. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index e1fb4493..8a3d72d4 100644 --- a/composer.json +++ b/composer.json @@ -8,7 +8,7 @@ "php": "^8.1", "guzzlehttp/guzzle": "^7.2", "laravel/framework": "^10.10", - "laravel/sanctum": "^3.2", + "laravel/sanctum": "^3.3", "laravel/tinker": "^2.8" }, "require-dev": { From 21ad6d6915df7d8b3825e6d7a7f47f716600e87b Mon Sep 17 00:00:00 2001 From: Tim MacDonald Date: Thu, 26 Oct 2023 06:32:54 +1100 Subject: [PATCH 13/17] Verify algo (#6258) --- config/hashing.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/hashing.php b/config/hashing.php index ae44a3e8..0e8a0bb3 100644 --- a/config/hashing.php +++ b/config/hashing.php @@ -30,6 +30,7 @@ return [ 'bcrypt' => [ 'rounds' => env('BCRYPT_ROUNDS', 12), + 'verify' => true, ], /* @@ -47,6 +48,7 @@ return [ 'memory' => 65536, 'threads' => 1, 'time' => 4, + 'verify' => true, ], ]; From ad1c5fe4c2e60e35d123eb4361a0734d51776e45 Mon Sep 17 00:00:00 2001 From: hedge-freek <117437674+hedge-freek@users.noreply.github.com> Date: Tue, 31 Oct 2023 15:38:55 +0100 Subject: [PATCH 14/17] Redis maintenance store config example contains an excess space (#6264) Binary operators should be surrounded by space a single space. --- config/app.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/app.php b/config/app.php index 4c231b47..9207160d 100644 --- a/config/app.php +++ b/config/app.php @@ -141,7 +141,7 @@ return [ 'maintenance' => [ 'driver' => 'file', - // 'store' => 'redis', + // 'store' => 'redis', ], /* From c7098938d3a2ee7c24c03b88652b1361d04671f9 Mon Sep 17 00:00:00 2001 From: driesvints Date: Tue, 31 Oct 2023 15:25:43 +0000 Subject: [PATCH 15/17] Update CHANGELOG --- CHANGELOG.md | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 12aaca99..e8007923 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,19 @@ # Release Notes -## [Unreleased](https://github.com/laravel/laravel/compare/v10.2.6...10.x) +## [Unreleased](https://github.com/laravel/laravel/compare/v10.2.7...10.x) + +## [v10.2.7](https://github.com/laravel/laravel/compare/v10.2.6...v10.2.7) - 2023-10-31 + +- Postmark mailer configuration update by [@ninjaparade](https://github.com/ninjaparade) in https://github.com/laravel/laravel/pull/6228 +- [10.x] Update sanctum config file by [@ahmed-aliraqi](https://github.com/ahmed-aliraqi) in https://github.com/laravel/laravel/pull/6234 +- [10.x] Let database handle default collation by [@Jubeki](https://github.com/Jubeki) in https://github.com/laravel/laravel/pull/6241 +- [10.x] Increase bcrypt rounds to 12 by [@valorin](https://github.com/valorin) in https://github.com/laravel/laravel/pull/6245 +- [10.x] Use 12 bcrypt rounds for password in UserFactory by [@Jubeki](https://github.com/Jubeki) in https://github.com/laravel/laravel/pull/6247 +- [10.x] Fix typo in the comment for token prefix (sanctum config) by [@yuters](https://github.com/yuters) in https://github.com/laravel/laravel/pull/6248 +- [10.x] Update fixture hash to match testing cost by [@timacdonald](https://github.com/timacdonald) in https://github.com/laravel/laravel/pull/6259 +- [10.x] Update minimum `laravel/sanctum` by [@crynobone](https://github.com/crynobone) in https://github.com/laravel/laravel/pull/6261 +- [10.x] Hash improvements by [@timacdonald](https://github.com/timacdonald) in https://github.com/laravel/laravel/pull/6258 +- Redis maintenance store config example contains an excess space by [@hedge-freek](https://github.com/hedge-freek) in https://github.com/laravel/laravel/pull/6264 ## [v10.2.6](https://github.com/laravel/laravel/compare/v10.2.5...v10.2.6) - 2023-08-10 From 024c86a24bdc8b02c38d41442f3908aae09f31a7 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Thu, 2 Nov 2023 08:42:28 -0500 Subject: [PATCH 16/17] Revert "Let database handle default collation (#6241)" (#6266) This reverts commit 74c5a01b09b24950cfcffbbc3bad9c2749f7388b. --- config/database.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/database.php b/config/database.php index 8cd8ed07..137ad18c 100644 --- a/config/database.php +++ b/config/database.php @@ -53,7 +53,7 @@ return [ 'password' => env('DB_PASSWORD', ''), 'unix_socket' => env('DB_SOCKET', ''), 'charset' => 'utf8mb4', - 'collation' => null, + 'collation' => 'utf8mb4_unicode_ci', 'prefix' => '', 'prefix_indexes' => true, 'strict' => true, From 40a7605dc1c5bea2d78fb31472e14b982252a5f2 Mon Sep 17 00:00:00 2001 From: driesvints Date: Thu, 2 Nov 2023 13:49:26 +0000 Subject: [PATCH 17/17] Update CHANGELOG --- CHANGELOG.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e8007923..f43e43fc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ # Release Notes -## [Unreleased](https://github.com/laravel/laravel/compare/v10.2.7...10.x) +## [Unreleased](https://github.com/laravel/laravel/compare/v10.2.8...10.x) + +## [v10.2.8](https://github.com/laravel/laravel/compare/v10.2.7...v10.2.8) - 2023-11-02 + +- Revert "[10.x] Let database handle default collation" by [@taylorotwell](https://github.com/taylorotwell) in https://github.com/laravel/laravel/pull/6266 ## [v10.2.7](https://github.com/laravel/laravel/compare/v10.2.6...v10.2.7) - 2023-10-31