|
| 1 | +diff --git a/.env.example b/.env.example |
| 2 | +index 00b6110e..478972c2 100644 |
| 3 | +--- a/.env.example |
| 4 | ++++ b/.env.example |
| 5 | +@@ -29,7 +29,7 @@ REDIS_PASSWORD=null |
| 6 | + REDIS_PORT=6379 |
| 7 | + |
| 8 | + MAIL_MAILER=smtp |
| 9 | +-MAIL_HOST=mailhog |
| 10 | ++MAIL_HOST=mailpit |
| 11 | + MAIL_PORT=1025 |
| 12 | + MAIL_USERNAME=null |
| 13 | + MAIL_PASSWORD=null |
| 14 | +diff --git a/CHANGELOG.md b/CHANGELOG.md |
| 15 | +index a32e0b4c..d7f8ef2d 100644 |
| 16 | +--- a/CHANGELOG.md |
| 17 | ++++ b/CHANGELOG.md |
| 18 | +@@ -1,6 +1,36 @@ |
| 19 | + # Release Notes |
| 20 | + |
| 21 | +-## [Unreleased](https://github.com/laravel/laravel/compare/v9.3.12...9.x) |
| 22 | ++## [Unreleased](https://github.com/laravel/laravel/compare/v9.5.1...9.x) |
| 23 | ++ |
| 24 | ++## [v9.5.1](https://github.com/laravel/laravel/compare/v9.5.0...v9.5.1) - 2023-01-11 |
| 25 | ++ |
| 26 | ++### Changed |
| 27 | ++ |
| 28 | ++- Use minimum stability "stable" by @taylorotwell in https://github.com/laravel/laravel/commit/c1092ec084bb294a61b0f1c2149fddd662f1fc55 |
| 29 | ++ |
| 30 | ++## [v9.5.0](https://github.com/laravel/laravel/compare/v9.4.1...v9.5.0) - 2023-01-02 |
| 31 | ++ |
| 32 | ++### Changed |
| 33 | ++ |
| 34 | ++- Update to Heroicons v2 by @driesvints in https://github.com/laravel/laravel/pull/6051 |
| 35 | ++- Support pusher-js v8.0 by @balu-lt in https://github.com/laravel/laravel/pull/6059 |
| 36 | ++- Switch password reset email to a primary key by @browner12 in https://github.com/laravel/laravel/pull/6064 |
| 37 | ++ |
| 38 | ++## [v9.4.1](https://github.com/laravel/laravel/compare/v9.4.0...v9.4.1) - 2022-12-19 |
| 39 | ++ |
| 40 | ++### Changed |
| 41 | ++ |
| 42 | ++- Add decimal translation by @taylorotwell in https://github.com/laravel/laravel/commit/39f4830e92a7467b2a7fe6bc23d0ec14bc3b46a6 |
| 43 | ++ |
| 44 | ++## [v9.4.0](https://github.com/laravel/laravel/compare/v9.3.12...v9.4.0) - 2022-12-15 |
| 45 | ++ |
| 46 | ++### Added |
| 47 | ++ |
| 48 | ++- Vite 4 support by @timacdonald in https://github.com/laravel/laravel/pull/6043 |
| 49 | ++ |
| 50 | ++### Changed |
| 51 | ++ |
| 52 | ++- Add ulid and ascii validation message by @nshiro in https://github.com/laravel/laravel/pull/6046 |
| 53 | + |
| 54 | + ## [v9.3.12](https://github.com/laravel/laravel/compare/v9.3.11...v9.3.12) - 2022-11-22 |
| 55 | + |
| 56 | +diff --git a/README.md b/README.md |
| 57 | +index bf0ddd92..3ed385a7 100644 |
| 58 | +--- a/README.md |
| 59 | ++++ b/README.md |
| 60 | +@@ -1,7 +1,7 @@ |
| 61 | + <p align="center"><a href="https://laravel.com" target="_blank"><img src="https://raw.githubusercontent.com/laravel/art/master/logo-lockup/5%20SVG/2%20CMYK/1%20Full%20Color/laravel-logolockup-cmyk-red.svg" width="400" alt="Laravel Logo"></a></p> |
| 62 | + |
| 63 | + <p align="center"> |
| 64 | +-<a href="https://travis-ci.org/laravel/framework"><img src="https://travis-ci.org/laravel/framework.svg" alt="Build Status"></a> |
| 65 | ++<a href="https://github.com/laravel/framework/actions"><img src="https://github.com/laravel/framework/workflows/tests/badge.svg" alt="Build Status"></a> |
| 66 | + <a href="https://packagist.org/packages/laravel/framework"><img src="https://img.shields.io/packagist/dt/laravel/framework" alt="Total Downloads"></a> |
| 67 | + <a href="https://packagist.org/packages/laravel/framework"><img src="https://img.shields.io/packagist/v/laravel/framework" alt="Latest Stable Version"></a> |
| 68 | + <a href="https://packagist.org/packages/laravel/framework"><img src="https://img.shields.io/packagist/l/laravel/framework" alt="License"></a> |
| 69 | +diff --git a/composer.json b/composer.json |
| 70 | +index 299b7e8a..024809f1 100644 |
| 71 | +--- a/composer.json |
| 72 | ++++ b/composer.json |
| 73 | +@@ -60,6 +60,6 @@ |
| 74 | + "pestphp/pest-plugin": true |
| 75 | + } |
| 76 | + }, |
| 77 | +- "minimum-stability": "dev", |
| 78 | ++ "minimum-stability": "stable", |
| 79 | + "prefer-stable": true |
| 80 | + } |
| 81 | +diff --git a/database/migrations/2014_10_12_100000_create_password_resets_table.php b/database/migrations/2014_10_12_100000_create_password_resets_table.php |
| 82 | +index fcacb80b..e5f1397c 100644 |
| 83 | +--- a/database/migrations/2014_10_12_100000_create_password_resets_table.php |
| 84 | ++++ b/database/migrations/2014_10_12_100000_create_password_resets_table.php |
| 85 | +@@ -14,7 +14,7 @@ return new class extends Migration |
| 86 | + public function up() |
| 87 | + { |
| 88 | + Schema::create('password_resets', function (Blueprint $table) { |
| 89 | +- $table->string('email')->index(); |
| 90 | ++ $table->string('email')->primary(); |
| 91 | + $table->string('token'); |
| 92 | + $table->timestamp('created_at')->nullable(); |
| 93 | + }); |
| 94 | +diff --git a/lang/en/validation.php b/lang/en/validation.php |
| 95 | +index ae23a76e..70407c9d 100644 |
| 96 | +--- a/lang/en/validation.php |
| 97 | ++++ b/lang/en/validation.php |
| 98 | +@@ -37,6 +37,7 @@ return [ |
| 99 | + 'date' => 'The :attribute is not a valid date.', |
| 100 | + 'date_equals' => 'The :attribute must be a date equal to :date.', |
| 101 | + 'date_format' => 'The :attribute does not match the format :format.', |
| 102 | ++ 'decimal' => 'The :attribute must have :decimal decimal places.', |
| 103 | + 'declined' => 'The :attribute must be declined.', |
| 104 | + 'declined_if' => 'The :attribute must be declined when :other is :value.', |
| 105 | + 'different' => 'The :attribute and :other must be different.', |
| 106 | +@@ -102,6 +103,11 @@ return [ |
| 107 | + 'string' => 'The :attribute must be at least :min characters.', |
| 108 | + ], |
| 109 | + 'min_digits' => 'The :attribute must have at least :min digits.', |
| 110 | ++ 'missing' => 'The :attribute field must be missing.', |
| 111 | ++ 'missing_if' => 'The :attribute field must be missing when :other is :value.', |
| 112 | ++ 'missing_unless' => 'The :attribute field must be missing unless :other is :value.', |
| 113 | ++ 'missing_with' => 'The :attribute field must be missing when :values is present.', |
| 114 | ++ 'missing_with_all' => 'The :attribute field must be missing when :values are present.', |
| 115 | + 'multiple_of' => 'The :attribute must be a multiple of :value.', |
| 116 | + 'not_in' => 'The selected :attribute is invalid.', |
| 117 | + 'not_regex' => 'The :attribute format is invalid.', |
| 118 | +diff --git a/resources/js/bootstrap.js b/resources/js/bootstrap.js |
| 119 | +index 366c49d0..a5b3eddc 100644 |
| 120 | +--- a/resources/js/bootstrap.js |
| 121 | ++++ b/resources/js/bootstrap.js |
| 122 | +@@ -26,6 +26,7 @@ window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest'; |
| 123 | + // window.Echo = new Echo({ |
| 124 | + // broadcaster: 'pusher', |
| 125 | + // key: import.meta.env.VITE_PUSHER_APP_KEY, |
| 126 | ++// cluster: import.meta.env.VITE_PUSHER_APP_CLUSTER ?? 'mt1', |
| 127 | + // wsHost: import.meta.env.VITE_PUSHER_HOST ? import.meta.env.VITE_PUSHER_HOST : `ws-${import.meta.env.VITE_PUSHER_APP_CLUSTER}.pusher.com`, |
| 128 | + // wsPort: import.meta.env.VITE_PUSHER_PORT ?? 80, |
| 129 | + // wssPort: import.meta.env.VITE_PUSHER_PORT ?? 443, |
| 130 | +diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php |
| 131 | +index 0ad6097c..9faad4e8 100644 |
| 132 | +--- a/resources/views/welcome.blade.php |
| 133 | ++++ b/resources/views/welcome.blade.php |
| 134 | +@@ -49,7 +49,7 @@ |
| 135 | + <div class="grid grid-cols-1 md:grid-cols-2"> |
| 136 | + <div class="p-6"> |
| 137 | + <div class="flex items-center"> |
| 138 | +- <svg fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" viewBox="0 0 24 24" class="w-8 h-8 text-gray-500"><path d="M12 6.253v13m0-13C10.832 5.477 9.246 5 7.5 5S4.168 5.477 3 6.253v13C4.168 18.477 5.754 18 7.5 18s3.332.477 4.5 1.253m0-13C13.168 5.477 14.754 5 16.5 5c1.747 0 3.332.477 4.5 1.253v13C19.832 18.477 18.247 18 16.5 18c-1.746 0-3.332.477-4.5 1.253"></path></svg> |
| 139 | ++ <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-8 h-8 text-gray-500"><path stroke-linecap="round" stroke-linejoin="round" d="M12 6.042A8.967 8.967 0 006 3.75c-1.052 0-2.062.18-3 .512v14.25A8.987 8.987 0 016 18c2.305 0 4.408.867 6 2.292m0-14.25a8.966 8.966 0 016-2.292c1.052 0 2.062.18 3 .512v14.25A8.987 8.987 0 0018 18a8.967 8.967 0 00-6 2.292m0-14.25v14.25" /></svg> |
| 140 | + <div class="ml-4 text-lg leading-7 font-semibold"><a href="https://laravel.com/docs" class="underline text-gray-900 dark:text-white">Documentation</a></div> |
| 141 | + </div> |
| 142 | + |
| 143 | +@@ -62,7 +62,7 @@ |
| 144 | + |
| 145 | + <div class="p-6 border-t border-gray-200 dark:border-gray-700 md:border-t-0 md:border-l"> |
| 146 | + <div class="flex items-center"> |
| 147 | +- <svg fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" viewBox="0 0 24 24" class="w-8 h-8 text-gray-500"><path d="M3 9a2 2 0 012-2h.93a2 2 0 001.664-.89l.812-1.22A2 2 0 0110.07 4h3.86a2 2 0 011.664.89l.812 1.22A2 2 0 0018.07 7H19a2 2 0 012 2v9a2 2 0 01-2 2H5a2 2 0 01-2-2V9z"></path><path d="M15 13a3 3 0 11-6 0 3 3 0 016 0z"></path></svg> |
| 148 | ++ <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-8 h-8 text-gray-500"><path stroke-linecap="round" d="M15.75 10.5l4.72-4.72a.75.75 0 011.28.53v11.38a.75.75 0 01-1.28.53l-4.72-4.72M4.5 18.75h9a2.25 2.25 0 002.25-2.25v-9a2.25 2.25 0 00-2.25-2.25h-9A2.25 2.25 0 002.25 7.5v9a2.25 2.25 0 002.25 2.25z" /></svg> |
| 149 | + <div class="ml-4 text-lg leading-7 font-semibold"><a href="https://laracasts.com" class="underline text-gray-900 dark:text-white">Laracasts</a></div> |
| 150 | + </div> |
| 151 | + |
| 152 | +@@ -75,7 +75,7 @@ |
| 153 | + |
| 154 | + <div class="p-6 border-t border-gray-200 dark:border-gray-700"> |
| 155 | + <div class="flex items-center"> |
| 156 | +- <svg fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" viewBox="0 0 24 24" class="w-8 h-8 text-gray-500"><path d="M7 8h10M7 12h4m1 8l-4-4H5a2 2 0 01-2-2V6a2 2 0 012-2h14a2 2 0 012 2v8a2 2 0 01-2 2h-3l-4 4z"></path></svg> |
| 157 | ++ <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-8 h-8 text-gray-500"><path stroke-linecap="round" stroke-linejoin="round" d="M7.5 8.25h9m-9 3H12m-9.75 1.51c0 1.6 1.123 2.994 2.707 3.227 1.129.166 2.27.293 3.423.379.35.026.67.21.865.501L12 21l2.755-4.133a1.14 1.14 0 01.865-.501 48.172 48.172 0 003.423-.379c1.584-.233 2.707-1.626 2.707-3.228V6.741c0-1.602-1.123-2.995-2.707-3.228A48.394 48.394 0 0012 3c-2.392 0-4.744.175-7.043.513C3.373 3.746 2.25 5.14 2.25 6.741v6.018z" /></svg> |
| 158 | + <div class="ml-4 text-lg leading-7 font-semibold"><a href="https://laravel-news.com/" class="underline text-gray-900 dark:text-white">Laravel News</a></div> |
| 159 | + </div> |
| 160 | + |
| 161 | +@@ -88,7 +88,7 @@ |
| 162 | + |
| 163 | + <div class="p-6 border-t border-gray-200 dark:border-gray-700 md:border-l"> |
| 164 | + <div class="flex items-center"> |
| 165 | +- <svg fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" viewBox="0 0 24 24" class="w-8 h-8 text-gray-500"><path d="M3.055 11H5a2 2 0 012 2v1a2 2 0 002 2 2 2 0 012 2v2.945M8 3.935V5.5A2.5 2.5 0 0010.5 8h.5a2 2 0 012 2 2 2 0 104 0 2 2 0 012-2h1.064M15 20.488V18a2 2 0 012-2h3.064M21 12a9 9 0 11-18 0 9 9 0 0118 0z"></path></svg> |
| 166 | ++ <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-8 h-8 text-gray-500"><path stroke-linecap="round" stroke-linejoin="round" d="M6.115 5.19l.319 1.913A6 6 0 008.11 10.36L9.75 12l-.387.775c-.217.433-.132.956.21 1.298l1.348 1.348c.21.21.329.497.329.795v1.089c0 .426.24.815.622 1.006l.153.076c.433.217.956.132 1.298-.21l.723-.723a8.7 8.7 0 002.288-4.042 1.087 1.087 0 00-.358-1.099l-1.33-1.108c-.251-.21-.582-.299-.905-.245l-1.17.195a1.125 1.125 0 01-.98-.314l-.295-.295a1.125 1.125 0 010-1.591l.13-.132a1.125 1.125 0 011.3-.21l.603.302a.809.809 0 001.086-1.086L14.25 7.5l1.256-.837a4.5 4.5 0 001.528-1.732l.146-.292M6.115 5.19A9 9 0 1017.18 4.64M6.115 5.19A8.965 8.965 0 0112 3c1.929 0 3.716.607 5.18 1.64" /></svg> |
| 167 | + <div class="ml-4 text-lg leading-7 font-semibold text-gray-900 dark:text-white">Vibrant Ecosystem</div> |
| 168 | + </div> |
| 169 | + |
| 170 | +@@ -104,16 +104,16 @@ |
| 171 | + <div class="flex justify-center mt-4 sm:items-center sm:justify-between"> |
| 172 | + <div class="text-center text-sm text-gray-500 sm:text-left"> |
| 173 | + <div class="flex items-center"> |
| 174 | +- <svg fill="none" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" viewBox="0 0 24 24" stroke="currentColor" class="-mt-px w-5 h-5 text-gray-400"> |
| 175 | +- <path d="M3 3h2l.4 2M7 13h10l4-8H5.4M7 13L5.4 5M7 13l-2.293 2.293c-.63.63-.184 1.707.707 1.707H17m0 0a2 2 0 100 4 2 2 0 000-4zm-8 2a2 2 0 11-4 0 2 2 0 014 0z"></path> |
| 176 | ++ <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="-mt-px w-5 h-5 text-gray-400"> |
| 177 | ++ <path stroke-linecap="round" stroke-linejoin="round" d="M2.25 3h1.386c.51 0 .955.343 1.087.835l.383 1.437M7.5 14.25a3 3 0 00-3 3h15.75m-12.75-3h11.218c1.121-2.3 2.1-4.684 2.924-7.138a60.114 60.114 0 00-16.536-1.84M7.5 14.25L5.106 5.272M6 20.25a.75.75 0 11-1.5 0 .75.75 0 011.5 0zm12.75 0a.75.75 0 11-1.5 0 .75.75 0 011.5 0z" /> |
| 178 | + </svg> |
| 179 | + |
| 180 | + <a href="https://laravel.bigcartel.com" class="ml-1 underline"> |
| 181 | + Shop |
| 182 | + </a> |
| 183 | + |
| 184 | +- <svg fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" viewBox="0 0 24 24" class="ml-4 -mt-px w-5 h-5 text-gray-400"> |
| 185 | +- <path d="M4.318 6.318a4.5 4.5 0 000 6.364L12 20.364l7.682-7.682a4.5 4.5 0 00-6.364-6.364L12 7.636l-1.318-1.318a4.5 4.5 0 00-6.364 0z"></path> |
| 186 | ++ <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="ml-4 -mt-px w-5 h-5 text-gray-400"> |
| 187 | ++ <path stroke-linecap="round" stroke-linejoin="round" d="M21 8.25c0-2.485-2.099-4.5-4.688-4.5-1.935 0-3.597 1.126-4.312 2.733-.715-1.607-2.377-2.733-4.313-2.733C5.1 3.75 3 5.765 3 8.25c0 7.22 9 12 9 12s9-4.78 9-12z" /> |
| 188 | + </svg> |
| 189 | + |
| 190 | + <a href="https://github.com/sponsors/taylorotwell" class="ml-1 underline"> |
0 commit comments