Merge pull request #109 from laravel/fix-phpstorm-on-windows-v1

Fix PHPStorm using absolute paths

Author: ashleyhindle

src/Console/InstallCommand.php

@@ -462,17 +462,18 @@ private function installMcpServerConfig(): void
             )->toArray()
         );
 
-        /** @var CodeEnvironment $mcpClient */
+        /** @var McpClient $mcpClient */
         foreach ($this->selectedTargetMcpClient as $mcpClient) {
             $ideName = $mcpClient->mcpClientName();
             $ideDisplay = str_pad($ideName, $longestIdeName);
             $this->output->write("  {$ideDisplay}... ");
             $results = [];
 
+            $php = $mcpClient->getPhpPath();
             if ($this->shouldInstallMcp()) {
                 try {
-                    $artisan = $mcpClient->useAbsolutePathForMcp ? base_path('artisan') : './artisan';
-                    $result = $mcpClient->installMcp('laravel-boost', 'php', [$artisan, 'boost:mcp']);
+                    $artisan = $mcpClient->getArtisanPath();
+                    $result = $mcpClient->installMcp('laravel-boost', $php, [$artisan, 'boost:mcp']);
 
                     if ($result) {
                         $results[] = $this->greenTick.' Boost';
@@ -491,7 +492,7 @@ private function installMcpServerConfig(): void
                 try {
                     $result = $mcpClient->installMcp(
                         key: 'herd',
-                        command: 'php',
+                        command: $php,
                         args: [$this->herd->mcpPath()],
                         env: ['SITE_PATH' => base_path()]
                     );

src/Contracts/McpClient.php

@@ -16,6 +16,21 @@ interface McpClient
      */
     public function mcpClientName(): ?string;
 
+    /**
+     * Whether to use absolute paths for MCP commands.
+     */
+    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

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

tests/Feature/Install/CodeEnvironment/CodeEnvironmentPathResolutionTest.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');
+});