Merge pull request #111 from laravel/refactor/#109

refactor: streamline path resolution and simplify the MCP client interface

Author: ashleyhindle

src/Console/InstallCommand.php

@@ -469,10 +469,10 @@ private function installMcpServerConfig(): void
             $this->output->write("  {$ideDisplay}... ");
             $results = [];
 
-            $php = $this->getPhpPathForMcpClient($mcpClient);
+            $php = $mcpClient->getPhpPath();
             if ($this->shouldInstallMcp()) {
                 try {
-                    $artisan = $this->getArtisanPathForMcpClient($mcpClient);
+                    $artisan = $mcpClient->getArtisanPath();
                     $result = $mcpClient->installMcp('laravel-boost', $php, [$artisan, 'boost:mcp']);
 
                     if ($result) {
@@ -492,7 +492,7 @@ private function installMcpServerConfig(): void
                 try {
                     $result = $mcpClient->installMcp(
                         key: 'herd',
-                        command: $this->getPhpPathForMcpClient($mcpClient),
+                        command: $mcpClient->getPhpPath(),
                         args: [$this->herd->mcpPath()],
                         env: ['SITE_PATH' => base_path()]
                     );
@@ -524,16 +524,6 @@ private function installMcpServerConfig(): void
         }
     }
 
-    private function getPhpPathForMcpClient(McpClient $mcpClient): string
-    {
-        return $mcpClient->useAbsolutePathForMcp() ? PHP_BINARY : 'php';
-    }
-
-    private function getArtisanPathForMcpClient(McpClient $mcpClient): string
-    {
-        return $mcpClient->useAbsolutePathForMcp() ? base_path('artisan') : './artisan';
-    }
-
     /**
      * Is the project actually using localization for their new features?
      */

src/Contracts/McpClient.php

@@ -21,6 +21,16 @@ public function mcpClientName(): ?string;
      */
     public function useAbsolutePathForMcp(): bool;
 
+    /**
+     * Get the PHP executable path for this MCP client.
+     */
+    public function getPhpPath(): string;
+
+    /**
+     * Get the artisan path for this MCP client.
+     */
+    public function getArtisanPath(): string;
+
     /**
      * Install an MCP server configuration in this IDE.
      *

src/Install/CodeEnvironment/CodeEnvironment.php

@@ -40,6 +40,17 @@ public function useAbsolutePathForMcp(): bool
         return $this->useAbsolutePathForMcp;
     }
 
+    public function getPhpPath(): string
+    {
+        return $this->useAbsolutePathForMcp() ? PHP_BINARY : 'php';
+    }
+
+    public function getArtisanPath(): string
+    {
+        return $this->useAbsolutePathForMcp() ? getcwd().'/artisan' : './artisan';
+
+    }
+
     /**
      * Get the detection configuration for system-wide installation detection.
      *

tests/Unit/Console/InstallCommandPhpPathTest.php

@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+use Laravel\Boost\Install\CodeEnvironment\Cursor;
+use Laravel\Boost\Install\CodeEnvironment\PhpStorm;
+use Laravel\Boost\Install\Detection\DetectionStrategyFactory;
+
+test('PhpStorm returns absolute PHP_BINARY path', function () {
+    $strategyFactory = Mockery::mock(DetectionStrategyFactory::class);
+    $phpStorm = new PhpStorm($strategyFactory);
+
+    expect($phpStorm->getPhpPath())->toBe(PHP_BINARY);
+});
+
+test('PhpStorm returns absolute artisan path', function () {
+    $strategyFactory = Mockery::mock(DetectionStrategyFactory::class);
+    $phpStorm = new PhpStorm($strategyFactory);
+
+    $artisanPath = $phpStorm->getArtisanPath();
+
+    // Should be an absolute path ending with 'artisan'
+    expect($artisanPath)->toEndWith('artisan')
+        ->and($artisanPath)->not()->toBe('./artisan');
+});
+
+test('Cursor returns relative php string', function () {
+    $strategyFactory = Mockery::mock(DetectionStrategyFactory::class);
+    $cursor = new Cursor($strategyFactory);
+
+    expect($cursor->getPhpPath())->toBe('php');
+});
+
+test('Cursor returns relative artisan path', function () {
+    $strategyFactory = Mockery::mock(DetectionStrategyFactory::class);
+    $cursor = new Cursor($strategyFactory);
+
+    expect($cursor->getArtisanPath())->toBe('./artisan');
+});