Skip to content

Commit d781a8a

Browse files
author
Version Bot
committed
[Version-Bot] Add Laravel Version
1 parent 5dbb07a commit d781a8a

20 files changed

+8434
-1
lines changed

diffs/v10.0.0...v10.2.9.diff

+780
Large diffs are not rendered by default.

diffs/v10.0.1...v10.2.9.diff

+764
Large diffs are not rendered by default.

diffs/v10.0.2...v10.2.9.diff

+750
Large diffs are not rendered by default.

diffs/v10.0.3...v10.2.9.diff

+702
Large diffs are not rendered by default.

diffs/v10.0.4...v10.2.9.diff

+684
Large diffs are not rendered by default.

diffs/v10.0.5...v10.2.9.diff

+614
Large diffs are not rendered by default.

diffs/v10.0.6...v10.2.9.diff

+583
Large diffs are not rendered by default.

diffs/v10.0.7...v10.2.9.diff

+557
Large diffs are not rendered by default.

diffs/v10.1.0...v10.2.9.diff

+411
Large diffs are not rendered by default.

diffs/v10.1.1...v10.2.9.diff

+403
Large diffs are not rendered by default.

diffs/v10.2.0...v10.2.9.diff

+366
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,366 @@
1+
diff --git a/.env.example b/.env.example
2+
index 478972c2..ea0665b0 100644
3+
--- a/.env.example
4+
+++ b/.env.example
5+
@@ -51,6 +51,7 @@ PUSHER_PORT=443
6+
PUSHER_SCHEME=https
7+
PUSHER_APP_CLUSTER=mt1
8+
9+
+VITE_APP_NAME="${APP_NAME}"
10+
VITE_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
11+
VITE_PUSHER_HOST="${PUSHER_HOST}"
12+
VITE_PUSHER_PORT="${PUSHER_PORT}"
13+
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
14+
index 8e6e9cd5..0e0c54ec 100644
15+
--- a/.github/workflows/tests.yml
16+
+++ b/.github/workflows/tests.yml
17+
@@ -19,13 +19,13 @@ jobs:
18+
strategy:
19+
fail-fast: true
20+
matrix:
21+
- php: [8.1, 8.2]
22+
+ php: [8.1, 8.2, 8.3]
23+
24+
name: PHP ${{ matrix.php }}
25+
26+
steps:
27+
- name: Checkout code
28+
- uses: actions/checkout@v3
29+
+ uses: actions/checkout@v4
30+
31+
- name: Setup PHP
32+
uses: shivammathur/setup-php@v2
33+
diff --git a/CHANGELOG.md b/CHANGELOG.md
34+
index 00cda728..f43e43fc 100644
35+
--- a/CHANGELOG.md
36+
+++ b/CHANGELOG.md
37+
@@ -1,6 +1,55 @@
38+
# Release Notes
39+
40+
-## [Unreleased](https://github.com/laravel/laravel/compare/v10.1.1...10.x)
41+
+## [Unreleased](https://github.com/laravel/laravel/compare/v10.2.8...10.x)
42+
+
43+
+## [v10.2.8](https://github.com/laravel/laravel/compare/v10.2.7...v10.2.8) - 2023-11-02
44+
+
45+
+- Revert "[10.x] Let database handle default collation" by [@taylorotwell](https://github.com/taylorotwell) in https://github.com/laravel/laravel/pull/6266
46+
+
47+
+## [v10.2.7](https://github.com/laravel/laravel/compare/v10.2.6...v10.2.7) - 2023-10-31
48+
+
49+
+- Postmark mailer configuration update by [@ninjaparade](https://github.com/ninjaparade) in https://github.com/laravel/laravel/pull/6228
50+
+- [10.x] Update sanctum config file by [@ahmed-aliraqi](https://github.com/ahmed-aliraqi) in https://github.com/laravel/laravel/pull/6234
51+
+- [10.x] Let database handle default collation by [@Jubeki](https://github.com/Jubeki) in https://github.com/laravel/laravel/pull/6241
52+
+- [10.x] Increase bcrypt rounds to 12 by [@valorin](https://github.com/valorin) in https://github.com/laravel/laravel/pull/6245
53+
+- [10.x] Use 12 bcrypt rounds for password in UserFactory by [@Jubeki](https://github.com/Jubeki) in https://github.com/laravel/laravel/pull/6247
54+
+- [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
55+
+- [10.x] Update fixture hash to match testing cost by [@timacdonald](https://github.com/timacdonald) in https://github.com/laravel/laravel/pull/6259
56+
+- [10.x] Update minimum `laravel/sanctum` by [@crynobone](https://github.com/crynobone) in https://github.com/laravel/laravel/pull/6261
57+
+- [10.x] Hash improvements by [@timacdonald](https://github.com/timacdonald) in https://github.com/laravel/laravel/pull/6258
58+
+- 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
59+
+
60+
+## [v10.2.6](https://github.com/laravel/laravel/compare/v10.2.5...v10.2.6) - 2023-08-10
61+
+
62+
+- Bump `laravel-vite-plugin` to latest version by [@adevade](https://github.com/adevade) in https://github.com/laravel/laravel/pull/6224
63+
+
64+
+## [v10.2.5](https://github.com/laravel/laravel/compare/v10.2.4...v10.2.5) - 2023-06-30
65+
+
66+
+- Allow accessing APP_NAME in Vite scope by [@domnantas](https://github.com/domnantas) in https://github.com/laravel/laravel/pull/6204
67+
+- Omit default values for suffix in phpunit.xml by [@spawnia](https://github.com/spawnia) in https://github.com/laravel/laravel/pull/6210
68+
+
69+
+## [v10.2.4](https://github.com/laravel/laravel/compare/v10.2.3...v10.2.4) - 2023-06-07
70+
+
71+
+- Add `precognitive` key to $middlewareAliases by @emargareten in https://github.com/laravel/laravel/pull/6193
72+
+
73+
+## [v10.2.3](https://github.com/laravel/laravel/compare/v10.2.2...v10.2.3) - 2023-06-01
74+
+
75+
+- Update description by @taylorotwell in https://github.com/laravel/laravel/commit/85203d687ebba72b2805b89bba7d18dfae8f95c8
76+
+
77+
+## [v10.2.2](https://github.com/laravel/laravel/compare/v10.2.1...v10.2.2) - 2023-05-23
78+
+
79+
+- Add lock path by @taylorotwell in https://github.com/laravel/laravel/commit/a6bfbc7f90e33fd6cae3cb23f106c9689858c3b5
80+
+
81+
+## [v10.2.1](https://github.com/laravel/laravel/compare/v10.2.0...v10.2.1) - 2023-05-12
82+
+
83+
+- Add hashed cast to user password by @emargareten in https://github.com/laravel/laravel/pull/6171
84+
+- Bring back pusher cluster config option by @jesseleite in https://github.com/laravel/laravel/pull/6174
85+
+
86+
+## [v10.2.0](https://github.com/laravel/laravel/compare/v10.1.1...v10.2.0) - 2023-05-05
87+
+
88+
+- Update welcome.blade.php by @aymanatmeh in https://github.com/laravel/laravel/pull/6163
89+
+- Sets package.json type to module by @timacdonald in https://github.com/laravel/laravel/pull/6090
90+
+- Add url support for mail config by @chu121su12 in https://github.com/laravel/laravel/pull/6170
91+
92+
## [v10.1.1](https://github.com/laravel/laravel/compare/v10.0.7...v10.1.1) - 2023-04-18
93+
94+
diff --git a/README.md b/README.md
95+
index 3ed385a7..1824fc1b 100644
96+
--- a/README.md
97+
+++ b/README.md
98+
@@ -31,23 +31,23 @@ If you don't feel like reading, [Laracasts](https://laracasts.com) can help. Lar
99+
100+
## Laravel Sponsors
101+
102+
-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).
103+
+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).
104+
105+
### Premium Partners
106+
107+
- **[Vehikl](https://vehikl.com/)**
108+
- **[Tighten Co.](https://tighten.co)**
109+
+- **[WebReinvent](https://webreinvent.com/)**
110+
- **[Kirschbaum Development Group](https://kirschbaumdevelopment.com)**
111+
- **[64 Robots](https://64robots.com)**
112+
-- **[Cubet Techno Labs](https://cubettech.com)**
113+
-- **[Cyber-Duck](https://cyber-duck.co.uk)**
114+
-- **[Many](https://www.many.co.uk)**
115+
-- **[Webdock, Fast VPS Hosting](https://www.webdock.io/en)**
116+
-- **[DevSquad](https://devsquad.com)**
117+
- **[Curotec](https://www.curotec.com/services/technologies/laravel/)**
118+
+- **[Cyber-Duck](https://cyber-duck.co.uk)**
119+
+- **[DevSquad](https://devsquad.com/hire-laravel-developers)**
120+
+- **[Jump24](https://jump24.co.uk)**
121+
+- **[Redberry](https://redberry.international/laravel/)**
122+
+- **[Active Logic](https://activelogic.com)**
123+
+- **[byte5](https://byte5.de)**
124+
- **[OP.GG](https://op.gg)**
125+
-- **[WebReinvent](https://webreinvent.com/?utm_source=laravel&utm_medium=github&utm_campaign=patreon-sponsors)**
126+
-- **[Lendio](https://lendio.com)**
127+
128+
## Contributing
129+
130+
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
131+
index 1fb53dce..494c0501 100644
132+
--- a/app/Http/Kernel.php
133+
+++ b/app/Http/Kernel.php
134+
@@ -60,6 +60,7 @@ class Kernel extends HttpKernel
135+
'can' => \Illuminate\Auth\Middleware\Authorize::class,
136+
'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
137+
'password.confirm' => \Illuminate\Auth\Middleware\RequirePassword::class,
138+
+ 'precognitive' => \Illuminate\Foundation\Http\Middleware\HandlePrecognitiveRequests::class,
139+
'signed' => \App\Http\Middleware\ValidateSignature::class,
140+
'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
141+
'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
142+
diff --git a/app/Models/User.php b/app/Models/User.php
143+
index 23b40634..4d7f70f5 100644
144+
--- a/app/Models/User.php
145+
+++ b/app/Models/User.php
146+
@@ -40,5 +40,6 @@ class User extends Authenticatable
147+
*/
148+
protected $casts = [
149+
'email_verified_at' => 'datetime',
150+
+ 'password' => 'hashed',
151+
];
152+
}
153+
diff --git a/composer.json b/composer.json
154+
index 4ac9c6ab..8a3d72d4 100644
155+
--- a/composer.json
156+
+++ b/composer.json
157+
@@ -1,14 +1,14 @@
158+
{
159+
"name": "laravel/laravel",
160+
"type": "project",
161+
- "description": "The Laravel Framework.",
162+
- "keywords": ["framework", "laravel"],
163+
+ "description": "The skeleton application for the Laravel framework.",
164+
+ "keywords": ["laravel", "framework"],
165+
"license": "MIT",
166+
"require": {
167+
"php": "^8.1",
168+
"guzzlehttp/guzzle": "^7.2",
169+
- "laravel/framework": "^10.8",
170+
- "laravel/sanctum": "^3.2",
171+
+ "laravel/framework": "^10.10",
172+
+ "laravel/sanctum": "^3.3",
173+
"laravel/tinker": "^2.8"
174+
},
175+
"require-dev": {
176+
diff --git a/config/app.php b/config/app.php
177+
index 4c231b47..9207160d 100644
178+
--- a/config/app.php
179+
+++ b/config/app.php
180+
@@ -141,7 +141,7 @@ return [
181+
182+
'maintenance' => [
183+
'driver' => 'file',
184+
- // 'store' => 'redis',
185+
+ // 'store' => 'redis',
186+
],
187+
188+
/*
189+
diff --git a/config/broadcasting.php b/config/broadcasting.php
190+
index 9e4d4aa4..24104853 100644
191+
--- a/config/broadcasting.php
192+
+++ b/config/broadcasting.php
193+
@@ -36,6 +36,7 @@ return [
194+
'secret' => env('PUSHER_APP_SECRET'),
195+
'app_id' => env('PUSHER_APP_ID'),
196+
'options' => [
197+
+ 'cluster' => env('PUSHER_APP_CLUSTER'),
198+
'host' => env('PUSHER_HOST') ?: 'api-'.env('PUSHER_APP_CLUSTER', 'mt1').'.pusher.com',
199+
'port' => env('PUSHER_PORT', 443),
200+
'scheme' => env('PUSHER_SCHEME', 'https'),
201+
diff --git a/config/cache.php b/config/cache.php
202+
index 33bb2954..d4171e22 100644
203+
--- a/config/cache.php
204+
+++ b/config/cache.php
205+
@@ -52,6 +52,7 @@ return [
206+
'file' => [
207+
'driver' => 'file',
208+
'path' => storage_path('framework/cache/data'),
209+
+ 'lock_path' => storage_path('framework/cache/data'),
210+
],
211+
212+
'memcached' => [
213+
diff --git a/config/hashing.php b/config/hashing.php
214+
index bcd3be4c..0e8a0bb3 100644
215+
--- a/config/hashing.php
216+
+++ b/config/hashing.php
217+
@@ -29,7 +29,8 @@ return [
218+
*/
219+
220+
'bcrypt' => [
221+
- 'rounds' => env('BCRYPT_ROUNDS', 10),
222+
+ 'rounds' => env('BCRYPT_ROUNDS', 12),
223+
+ 'verify' => true,
224+
],
225+
226+
/*
227+
@@ -47,6 +48,7 @@ return [
228+
'memory' => 65536,
229+
'threads' => 1,
230+
'time' => 4,
231+
+ 'verify' => true,
232+
],
233+
234+
];
235+
diff --git a/config/mail.php b/config/mail.php
236+
index e652bd02..d7416b15 100644
237+
--- a/config/mail.php
238+
+++ b/config/mail.php
239+
@@ -59,6 +59,7 @@ return [
240+
241+
'postmark' => [
242+
'transport' => 'postmark',
243+
+ // 'message_stream_id' => null,
244+
// 'client' => [
245+
// 'timeout' => 5,
246+
// ],
247+
diff --git a/config/sanctum.php b/config/sanctum.php
248+
index 529cfdc9..35d75b31 100644
249+
--- a/config/sanctum.php
250+
+++ b/config/sanctum.php
251+
@@ -41,13 +41,28 @@ return [
252+
|--------------------------------------------------------------------------
253+
|
254+
| This value controls the number of minutes until an issued token will be
255+
- | considered expired. If this value is null, personal access tokens do
256+
- | not expire. This won't tweak the lifetime of first-party sessions.
257+
+ | considered expired. This will override any values set in the token's
258+
+ | "expires_at" attribute, but first-party sessions are not affected.
259+
|
260+
*/
261+
262+
'expiration' => null,
263+
264+
+ /*
265+
+ |--------------------------------------------------------------------------
266+
+ | Token Prefix
267+
+ |--------------------------------------------------------------------------
268+
+ |
269+
+ | Sanctum can prefix new tokens in order to take advantage of numerous
270+
+ | security scanning initiatives maintained by open source platforms
271+
+ | that notify developers if they commit tokens into repositories.
272+
+ |
273+
+ | See: https://docs.github.com/en/code-security/secret-scanning/about-secret-scanning
274+
+ |
275+
+ */
276+
+
277+
+ 'token_prefix' => env('SANCTUM_TOKEN_PREFIX', ''),
278+
+
279+
/*
280+
|--------------------------------------------------------------------------
281+
| Sanctum Middleware
282+
@@ -60,8 +75,9 @@ return [
283+
*/
284+
285+
'middleware' => [
286+
- 'verify_csrf_token' => App\Http\Middleware\VerifyCsrfToken::class,
287+
+ 'authenticate_session' => Laravel\Sanctum\Http\Middleware\AuthenticateSession::class,
288+
'encrypt_cookies' => App\Http\Middleware\EncryptCookies::class,
289+
+ 'verify_csrf_token' => App\Http\Middleware\VerifyCsrfToken::class,
290+
],
291+
292+
];
293+
diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php
294+
index a6ecc0af..cde014af 100644
295+
--- a/database/factories/UserFactory.php
296+
+++ b/database/factories/UserFactory.php
297+
@@ -3,6 +3,7 @@
298+
namespace Database\Factories;
299+
300+
use Illuminate\Database\Eloquent\Factories\Factory;
301+
+use Illuminate\Support\Facades\Hash;
302+
use Illuminate\Support\Str;
303+
304+
/**
305+
@@ -10,6 +11,8 @@ use Illuminate\Support\Str;
306+
*/
307+
class UserFactory extends Factory
308+
{
309+
+ protected static ?string $password;
310+
+
311+
/**
312+
* Define the model's default state.
313+
*
314+
@@ -21,7 +24,7 @@ class UserFactory extends Factory
315+
'name' => fake()->name(),
316+
'email' => fake()->unique()->safeEmail(),
317+
'email_verified_at' => now(),
318+
- 'password' => '$2y$10$92IXUNpkjO0rOQ5byMi.Ye4oKoEa3Ro9llC/.og/at2.uheWG/igi', // password
319+
+ 'password' => static::$password ??= Hash::make('password'),
320+
'remember_token' => Str::random(10),
321+
];
322+
}
323+
diff --git a/package.json b/package.json
324+
index e543e0d1..e9319dfe 100644
325+
--- a/package.json
326+
+++ b/package.json
327+
@@ -6,8 +6,8 @@
328+
"build": "vite build"
329+
},
330+
"devDependencies": {
331+
- "axios": "^1.1.2",
332+
- "laravel-vite-plugin": "^0.7.5",
333+
+ "axios": "^1.6.1",
334+
+ "laravel-vite-plugin": "^0.8.0",
335+
"vite": "^4.0.0"
336+
}
337+
}
338+
diff --git a/phpunit.xml b/phpunit.xml
339+
index e9f533da..f112c0c8 100644
340+
--- a/phpunit.xml
341+
+++ b/phpunit.xml
342+
@@ -1,20 +1,20 @@
343+
<?xml version="1.0" encoding="UTF-8"?>
344+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
345+
- xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
346+
+ xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
347+
bootstrap="vendor/autoload.php"
348+
colors="true"
349+
>
350+
<testsuites>
351+
<testsuite name="Unit">
352+
- <directory suffix="Test.php">./tests/Unit</directory>
353+
+ <directory>tests/Unit</directory>
354+
</testsuite>
355+
<testsuite name="Feature">
356+
- <directory suffix="Test.php">./tests/Feature</directory>
357+
+ <directory>tests/Feature</directory>
358+
</testsuite>
359+
</testsuites>
360+
<source>
361+
<include>
362+
- <directory suffix=".php">./app</directory>
363+
+ <directory>app</directory>
364+
</include>
365+
</source>
366+
<php>

0 commit comments

Comments
 (0)