Merge branch 'main' into guidelines-galore

# Conflicts:
#	.ai/laravel/core.blade.php
#	src/Console/InstallCommand.php

Author: ashleyhindle

.ai/laravel/core.blade.php

@@ -1,5 +1,5 @@
 ## Do Things the Laravel Way
-- Use `./artisan make:` commands to create new files (i.e. migrations, controllers, models, etc.). You can list available artisan commands with the `list-artisan-commands` tool.
+- Use `php artisan make:` commands to create new files (i.e. migrations, controllers, models, etc.). You can list available artisan commands with the `list-artisan-commands` tool.
 - If you're creating a generic PHP class, use `artisan make:class`.
 
 ## Database
@@ -14,7 +14,7 @@
 - **Validation rule style**: Check sibling form requests to see if the project uses array or string based validation rules.
 
 ## Model Creation
-- When creating new models, create useful factories and seeders for them too. Ask the user if they need any other things, use `list-artisan-commands` to check the available options to `./artisan make:model`
+- When creating new models, create useful factories and seeders for them too. Ask the user if they need any other things, use `list-artisan-commands` to check the available options to `php artisan make:model`
 
 ## APIs and Eloquent Resources
 - For APIs, default to using Eloquent API Resources and API versioning, unless existing API routes do not, then you should follow existing convention.

.ai/pest/core.blade.php

@@ -4,7 +4,7 @@
 # Pest Tests
 - All tests must be written using Pest.
 - You must not remove any tests or test files from the tests directory without approval. These are not temporary or helper files, these are core to the application.
-- Tests should test all of the the unhappy paths, happy paths, and weird paths.
+- Tests should test all of the unhappy paths, happy paths, and weird paths.
 - Tests live in the `tests/Feature` and `tests/Unit` directories.
 - Pest tests look and behave like this:
 <code-snippet name="Basic example Pest test" lang="php">

README.md

@@ -34,7 +34,7 @@ composer require laravel/boost --dev
 
 Install the MCP server & guidelines
 ```bash
-./artisan boost:install
+php artisan boost:install
 ```
 
 You're ready to go!

config/boost.php

@@ -3,6 +3,16 @@
 declare(strict_types=1);
 
 return [
-    'project_purpose' => null,
-    'browser_logs' => true,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Boost Browser Logs Watcher Switch
+    |--------------------------------------------------------------------------
+    |
+    | The following option may be used to enable or disable browser logs watcher
+    | functionality which simply provides a single and convenient way to
+    | enable or disable browser logs functionality in Boost.
+    */
+
+    'browser_logs_watcher' => env('BOOST_BROWSER_LOGS_WATCHER', true),
 ];

pint.json

@@ -111,7 +111,7 @@
         "phpdoc_align": {
             "align": "left",
             "spacing": {
-                "param": 2
+                "param": 1
             }
         },
         "phpdoc_indent": true,

src/BoostServiceProvider.php

@@ -7,10 +7,10 @@
 use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Router;
-use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Route;
 use Illuminate\Support\ServiceProvider;
+use Illuminate\View\Compilers\BladeCompiler;
 use Laravel\Boost\Mcp\Boost;
 use Laravel\Boost\Middleware\InjectBoost;
 use Laravel\Mcp\Server\Facades\Mcp;
@@ -21,18 +21,21 @@ class BoostServiceProvider extends ServiceProvider
     public function register(): void
     {
         $this->mergeConfigFrom(
-            __DIR__.'/../config/boost.php', 'boost'
+            __DIR__.'/../config/boost.php',
+            'boost'
         );
 
         $this->app->singleton(Roster::class, function () {
-            $composerLockPath = base_path('composer.lock');
-            $packageLockPath = base_path('package-lock.json');
+            $lockFiles = [
+                base_path('composer.lock'),
+                base_path('package-lock.json'),
+                base_path('bun.lockb'),
+                base_path('pnpm-lock.yaml'),
+                base_path('yarn.lock'),
+            ];
 
             $cacheKey = 'boost.roster.scan';
-            $lastModified = max(
-                file_exists($composerLockPath) ? filemtime($composerLockPath) : 0,
-                file_exists($packageLockPath) ? filemtime($packageLockPath) : 0
-            );
+            $lastModified = max(array_map(fn ($path) => file_exists($path) ? filemtime($path) : 0, $lockFiles));
 
             $cached = cache()->get($cacheKey);
             if ($cached && isset($cached['timestamp']) && $cached['timestamp'] >= $lastModified) {
@@ -62,7 +65,7 @@ public function boot(Router $router): void
         $this->registerCommands();
         $this->registerRoutes();
         $this->registerBrowserLogger();
-        $this->registerBladeDirectives();
+        $this->callAfterResolving('blade.compiler', fn (BladeCompiler $bladeCompiler) => $this->registerBladeDirectives($bladeCompiler));
         $this->hookIntoResponses($router);
     }
 
@@ -93,10 +96,17 @@ private function registerRoutes(): void
             /** @var \Illuminate\Log\Logger $logger */
             $logger = Log::channel('browser');
 
-            /** @var array{type: 'error'|'warn'|'info'|'log'|'table'|'window_error'|'uncaught_error'|'unhandled_rejection', timestamp: string, data: array<mixed>, url:string, userAgent:string} $log */
+            /**
+             *  @var array{
+             *      type: 'error'|'warn'|'info'|'log'|'table'|'window_error'|'uncaught_error'|'unhandled_rejection',
+             *      timestamp: string,
+             *      data: array<mixed>,
+             *      url:string,
+             *      userAgent:string
+             *  } $log */
             foreach ($logs as $log) {
                 $logger->write(
-                    level: $this->jsTypeToPsr3($log['type']),
+                    level: $this->mapJsTypeToPsr3Level($log['type']),
                     message: $this->buildLogMessageFromData($log['data']),
                     context: [
                         'url' => $log['url'],
@@ -107,58 +117,53 @@ private function registerRoutes(): void
             }
 
             return response()->json(['status' => 'logged']);
-        })->name('boost.browser-logs')->withoutMiddleware(VerifyCsrfToken::class);
+        })
+            ->name('boost.browser-logs')
+            ->withoutMiddleware(VerifyCsrfToken::class);
     }
 
     /**
      * Build a string message for the log based on various input types. Single dimensional, and multi:
-     * "data":[{"message":"Unhandled Promise Rejection","reason":{"name":"TypeError","message":"NetworkError when attempting to fetch resource.","stack":""}}]
+     * "data":[
+     * {"message":"Unhandled Promise Rejection","reason":{"name":"TypeError","message":"NetworkError when attempting to fetch resource.","stack":""}}]
      *
-     * @param  array<mixed>  $data
+     * @param array<mixed> $data
      */
     protected function buildLogMessageFromData(array $data): string
     {
         $messages = [];
 
-        foreach ($data as $key => $value) {
-            if (is_array($value)) {
-                $nestedMessage = $this->buildLogMessageFromData($value);
-                if ($nestedMessage !== '') {
-                    $messages[] = $nestedMessage;
-                }
-            } elseif (is_string($value) || is_numeric($value)) {
-                $messages[] = (string) $value;
-            } elseif (is_bool($value)) {
-                $messages[] = $value ? 'true' : 'false';
-            } elseif (is_null($value)) {
-                $messages[] = 'null';
-            } elseif (is_object($value)) {
-                $messages[] = json_encode($value);
-            }
+        foreach ($data as $value) {
+            $messages[] = match (true) {
+                is_array($value) => $this->buildLogMessageFromData($value),
+                is_string($value), is_numeric($value) => (string) $value,
+                is_bool($value) => $value ? 'true' : 'false',
+                is_null($value) => 'null',
+                is_object($value) => json_encode($value),
+            };
         }
 
         return implode(' ', $messages);
     }
 
     protected function registerBrowserLogger(): void
     {
-        // Register a custom log channel for browser logs
-        config(['logging.channels.browser' => [
-            'driver' => 'single',
-            'path' => storage_path('logs/browser.log'),
-            'level' => env('LOG_LEVEL', 'debug'),
-            'days' => 14,
-        ]]);
+        config([
+            'logging.channels.browser' => [
+                'driver' => 'single',
+                'path' => storage_path('logs/browser.log'),
+                'level' => env('LOG_LEVEL', 'debug'),
+                'days' => 14,
+            ],
+        ]);
     }
 
-    protected function registerBladeDirectives(): void
+    protected function registerBladeDirectives(BladeCompiler $bladeCompiler): void
     {
-        Blade::directive('boostJs', function () {
-            return '<?php echo \\Laravel\\Boost\\Services\\BrowserLogger::getScript(); ?>';
-        });
+        $bladeCompiler->directive('boostJs', fn () => '<?php echo \\Laravel\\Boost\\Services\\BrowserLogger::getScript(); ?>');
     }
 
-    private function jsTypeToPsr3(string $type): string
+    private function mapJsTypeToPsr3Level(string $type): string
     {
         return match ($type) {
             'warn' => 'warning',
@@ -173,7 +178,7 @@ private function jsTypeToPsr3(string $type): string
 
     private function hookIntoResponses(Router $router): void
     {
-        if (config('boost.browser_logs', true) === false) {
+        if (! config('boost.browser_logs_watcher', true)) {
             return;
         }
 

src/Concerns/MakesHttpRequests.php

@@ -30,7 +30,7 @@ public function get(string $url): Response
     }
 
     /**
-     * @param  array<string, mixed>  $json
+     * @param array<string, mixed> $json
      */
     public function json(string $url, array $json): Response
     {