Skip to content

Commit 195e013

Browse files
author
Version Bot
committed
[Version-Bot] Add Laravel Version
1 parent d781a8a commit 195e013

21 files changed

+9059
-1
lines changed

diffs/v10.0.0...v10.2.10.diff

+809
Large diffs are not rendered by default.

diffs/v10.0.1...v10.2.10.diff

+793
Large diffs are not rendered by default.

diffs/v10.0.2...v10.2.10.diff

+779
Large diffs are not rendered by default.

diffs/v10.0.3...v10.2.10.diff

+731
Large diffs are not rendered by default.

diffs/v10.0.4...v10.2.10.diff

+713
Large diffs are not rendered by default.

diffs/v10.0.5...v10.2.10.diff

+643
Large diffs are not rendered by default.

diffs/v10.0.6...v10.2.10.diff

+612
Large diffs are not rendered by default.

diffs/v10.0.7...v10.2.10.diff

+586
Large diffs are not rendered by default.

diffs/v10.1.0...v10.2.10.diff

+440
Large diffs are not rendered by default.

diffs/v10.1.1...v10.2.10.diff

+432
Large diffs are not rendered by default.

diffs/v10.2.0...v10.2.10.diff

+395
Large diffs are not rendered by default.

diffs/v10.2.1...v10.2.10.diff

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

0 commit comments

Comments
 (0)