Merge branch 'main' into workos

taylorotwell · taylorotwell · commit b0865ad218b4 · 2025-02-24T14:41:41.000-06:00
diff --git a/.env.example b/.env.example
@@ -2,7 +2,6 @@ APP_NAME=Laravel
 APP_ENV=local
 APP_KEY=
 APP_DEBUG=true
-APP_TIMEZONE=UTC
 APP_URL=http://localhost
 
 APP_LOCALE=en
@@ -39,7 +38,7 @@ FILESYSTEM_DISK=local
 QUEUE_CONNECTION=database
 
 CACHE_STORE=database
-CACHE_PREFIX=
+# CACHE_PREFIX=
 
 MEMCACHED_HOST=127.0.0.1
 
@@ -49,11 +48,11 @@ REDIS_PASSWORD=null
 REDIS_PORT=6379
 
 MAIL_MAILER=log
+MAIL_SCHEME=null
 MAIL_HOST=127.0.0.1
 MAIL_PORT=2525
 MAIL_USERNAME=null
 MAIL_PASSWORD=null
-MAIL_ENCRYPTION=null
 MAIL_FROM_ADDRESS="hello@example.com"
 MAIL_FROM_NAME="${APP_NAME}"
 
diff --git a/.gitignore b/.gitignore
@@ -1,25 +1,23 @@
-.DS_Store
-.env
-.env.backup
-.env.production
-.phpactor.json
-.phpunit.result.cache
-/.fleet
-/.idea
-/.nova
 /.phpunit.cache
-/.vscode
-/.zed
-/bootstrap/ssr
 /node_modules
 /public/build
 /public/hot
 /public/storage
 /storage/*.key
 /storage/pail
 /vendor
-auth.json
+.env
+.env.backup
+.env.production
+.phpactor.json
+.phpunit.result.cache
 Homestead.json
 Homestead.yaml
 npm-debug.log
 yarn-error.log
+/auth.json
+/.fleet
+/.idea
+/.nova
+/.vscode
+/.zed
diff --git a/app/Http/Middleware/HandleInertiaRequests.php b/app/Http/Middleware/HandleInertiaRequests.php
@@ -38,13 +38,13 @@ public function share(Request $request): array
     {
         [$message, $author] = str(Inspiring::quotes()->random())->explode('-');
 
-        return array_merge(parent::share($request), [
+        return [
             ...parent::share($request),
             'name' => config('app.name'),
             'quote' => ['message' => trim($message), 'author' => trim($author)],
             'auth' => [
                 'user' => $request->user(),
             ],
-        ]);
+        ];
     }
 }
diff --git a/artisan b/artisan
@@ -1,6 +1,7 @@
 #!/usr/bin/env php
 <?php
 
+use Illuminate\Foundation\Application;
 use Symfony\Component\Console\Input\ArgvInput;
 
 define('LARAVEL_START', microtime(true));
@@ -9,7 +10,9 @@ define('LARAVEL_START', microtime(true));
 require __DIR__.'/vendor/autoload.php';
 
 // Bootstrap Laravel and handle the command...
-$status = (require_once __DIR__.'/bootstrap/app.php')
-    ->handleCommand(new ArgvInput);
+/** @var Application $app */
+$app = require_once __DIR__.'/bootstrap/app.php';
+
+$status = $app->handleCommand(new ArgvInput);
 
 exit($status);
diff --git a/composer.json b/composer.json
@@ -72,6 +72,6 @@
             "php-http/discovery": true
         }
     },
-    "minimum-stability": "dev",
+    "minimum-stability": "stable",
     "prefer-stable": true
 }
diff --git a/config/app.php b/config/app.php
@@ -65,7 +65,7 @@
     |
     */
 
-    'timezone' => env('APP_TIMEZONE', 'UTC'),
+    'timezone' => 'UTC',
 
     /*
     |--------------------------------------------------------------------------
diff --git a/config/filesystems.php b/config/filesystems.php
@@ -35,6 +35,7 @@
             'root' => storage_path('app/private'),
             'serve' => true,
             'throw' => false,
+            'report' => false,
         ],
 
         'public' => [
@@ -43,6 +44,7 @@
             'url' => env('APP_URL').'/storage',
             'visibility' => 'public',
             'throw' => false,
+            'report' => false,
         ],
 
         's3' => [
@@ -55,6 +57,7 @@
             'endpoint' => env('AWS_ENDPOINT'),
             'use_path_style_endpoint' => env('AWS_USE_PATH_STYLE_ENDPOINT', false),
             'throw' => false,
+            'report' => false,
         ],
 
     ],
diff --git a/config/mail.php b/config/mail.php
@@ -39,10 +39,10 @@
 
         'smtp' => [
             'transport' => 'smtp',
+            'scheme' => env('MAIL_SCHEME'),
             'url' => env('MAIL_URL'),
             'host' => env('MAIL_HOST', '127.0.0.1'),
             'port' => env('MAIL_PORT', 2525),
-            'encryption' => env('MAIL_ENCRYPTION', 'tls'),
             'username' => env('MAIL_USERNAME'),
             'password' => env('MAIL_PASSWORD'),
             'timeout' => null,
diff --git a/config/session.php b/config/session.php
@@ -32,7 +32,7 @@
     |
     */
 
-    'lifetime' => env('SESSION_LIFETIME', 120),
+    'lifetime' => (int) env('SESSION_LIFETIME', 120),
 
     'expire_on_close' => env('SESSION_EXPIRE_ON_CLOSE', false),
 
diff --git a/public/.htaccess b/public/.htaccess
@@ -9,6 +9,10 @@
     RewriteCond %{HTTP:Authorization} .
     RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
 
+    # Handle X-XSRF-Token Header
+    RewriteCond %{HTTP:x-xsrf-token} .
+    RewriteRule .* - [E=HTTP_X_XSRF_TOKEN:%{HTTP:X-XSRF-Token}]
+
     # Redirect Trailing Slashes If Not A Folder...
     RewriteCond %{REQUEST_FILENAME} !-d
     RewriteCond %{REQUEST_URI} (.+)/$
diff --git a/public/index.php b/public/index.php
@@ -1,5 +1,6 @@
 <?php
 
+use Illuminate\Foundation\Application;
 use Illuminate\Http\Request;
 
 define('LARAVEL_START', microtime(true));
@@ -13,5 +14,7 @@
 require __DIR__.'/../vendor/autoload.php';
 
 // Bootstrap Laravel and handle the request...
-(require_once __DIR__.'/../bootstrap/app.php')
-    ->handleRequest(Request::capture());
+/** @var Application $app */
+$app = require_once __DIR__.'/../bootstrap/app.php';
+
+$app->handleRequest(Request::capture());
diff --git a/resources/js/hooks/use-initials.tsx b/resources/js/hooks/use-initials.tsx
@@ -5,7 +5,10 @@ export function useInitials() {
         if (names.length === 0) return '';
         if (names.length === 1) return names[0].charAt(0).toUpperCase();
 
-        return `${names[0].charAt(0)}${names[names.length - 1].charAt(0)}`.toUpperCase();
+        const firstInitial = names[0].charAt(0);
+        const lastInitial = names[names.length - 1].charAt(0);
+
+        return `${firstInitial}${lastInitial}`.toUpperCase();
     };
 
     return getInitials;
diff --git a/resources/js/pages/settings/profile.tsx b/resources/js/pages/settings/profile.tsx
@@ -30,7 +30,9 @@ export default function Profile({ status }: { status?: string }) {
     const submit: FormEventHandler = (e) => {
         e.preventDefault();
 
-        patch(route('profile.update'));
+        patch(route('profile.update'), {
+            preserveScroll: true,
+        });
     };
 
     return (
diff --git a/resources/js/pages/welcome.tsx b/resources/js/pages/welcome.tsx
@@ -39,7 +39,7 @@ export default function Welcome() {
                             <p className="mb-2 text-[#706f6c] dark:text-[#A1A09A]">
                                 Laravel has an incredibly rich ecosystem.
                                 <br />
-                                We suggest you start with the following.
+                                We suggest starting with the following.
                             </p>
                             <ul className="mb-4 flex flex-col lg:mb-6">
                                 <li className="relative flex items-center gap-4 py-2 before:absolute before:top-1/2 before:bottom-0 before:left-[0.4rem] before:border-l before:border-[#e3e3e0] dark:before:border-[#3E3E3A]">

Original file line number	Diff line number	Diff line change
`@@ -38,13 +38,13 @@ public function share(Request $request): array`
`38`	`38`	`{`
`39`	`39`	`[$message, $author] = str(Inspiring::quotes()->random())->explode('-');`
`40`	`40`
`41`		`- return array_merge(parent::share($request), [`
	`41`	`+ return [`
`42`	`42`	`...parent::share($request),`
`43`	`43`	`'name' => config('app.name'),`
`44`	`44`	`'quote' => ['message' => trim($message), 'author' => trim($author)],`
`45`	`45`	`'auth' => [`
`46`	`46`	`'user' => $request->user(),`
`47`	`47`	`],`
`48`		`- ]);`
	`48`	`+ ];`
`49`	`49`	`}`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,6 @@`
`72`	`72`	`"php-http/discovery": true`
`73`	`73`	`}`
`74`	`74`	`},`
`75`		`- "minimum-stability": "dev",`
	`75`	`+ "minimum-stability": "stable",`
`76`	`76`	`"prefer-stable": true`
`77`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@`
`65`	`65`	`\|`
`66`	`66`	`*/`
`67`	`67`
`68`		`- 'timezone' => env('APP_TIMEZONE', 'UTC'),`
	`68`	`+ 'timezone' => 'UTC',`
`69`	`69`
`70`	`70`	`/*`
`71`	`71`	`\|--------------------------------------------------------------------------`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@`
`32`	`32`	`\|`
`33`	`33`	`*/`
`34`	`34`
`35`		`- 'lifetime' => env('SESSION_LIFETIME', 120),`
	`35`	`+ 'lifetime' => (int) env('SESSION_LIFETIME', 120),`
`36`	`36`
`37`	`37`	`'expire_on_close' => env('SESSION_EXPIRE_ON_CLOSE', false),`
`38`	`38`