[Parallel] Handle Spaced root project main script on parallel process (…

…#4813) * [Parallel] Handle Spaced root project main script on parallel process * update main script example * try using double quoted for main script * use relative path for --config * use relative path for --config
rectorphp · Sep 14, 2023 · 0e869b9 · 0e869b9
1 parent 2384073
commit 0e869b9
Show file tree

Hide file tree

Showing 2 changed files with 69 additions and 5 deletions.
diff --git a/packages-tests/Parallel/Command/WorkerCommandLineFactoryTest.php b/packages-tests/Parallel/Command/WorkerCommandLineFactoryTest.php
@@ -27,6 +27,11 @@ final class WorkerCommandLineFactoryTest extends AbstractLazyTestCase
      */
     private const DUMMY_MAIN_SCRIPT = 'main_script';
 
+    /**
+     * @var string
+     */
+    private const SPACED_DUMMY_MAIN_SCRIPT = 'C:\Users\P\Desktop\Web Dev\vendor\bin\rector';
+
     private WorkerCommandLineFactory $workerCommandLineFactory;
 
     private ProcessCommand $processCommand;
@@ -37,6 +42,63 @@ protected function setUp(): void
         $this->processCommand = $this->make(ProcessCommand::class);
     }
 
+        /**
+     * @param array<string, mixed> $inputParameters
+     */
+    #[DataProvider('provideDataSpacedMainScript')]
+    public function testSpacedMainScript(array $inputParameters, string $expectedCommand): void
+    {
+        $inputDefinition = $this->prepareProcessCommandDefinition();
+        $arrayInput = new ArrayInput($inputParameters, $inputDefinition);
+
+        $workerCommandLine = $this->workerCommandLineFactory->create(
+            self::SPACED_DUMMY_MAIN_SCRIPT,
+            ProcessCommand::class,
+            'worker',
+            $arrayInput,
+            'identifier',
+            2000
+        );
+
+        $this->assertSame($expectedCommand, $workerCommandLine);
+    }
+
+    /**
+     * @return Iterator<array<int, array<string, string|string[]|bool>>|string[]>
+     */
+    public static function provideDataSpacedMainScript(): Iterator
+    {
+        $cliInputOptions = array_slice($_SERVER['argv'], 1);
+        $cliInputOptionsAsString = implode("' '", $cliInputOptions);
+
+        yield [
+            [
+                self::COMMAND => 'process',
+                Option::SOURCE => ['src'],
+            ],
+            "'" . PHP_BINARY . "' '" . self::SPACED_DUMMY_MAIN_SCRIPT . "' '" . $cliInputOptionsAsString . "' worker --port 2000 --identifier 'identifier' 'src' --output-format 'json' --no-ansi",
+        ];
+
+        yield [
+            [
+                self::COMMAND => 'process',
+                Option::SOURCE => ['src'],
+                '--' . Option::OUTPUT_FORMAT => ConsoleOutputFormatter::NAME,
+            ],
+            "'" . PHP_BINARY . "' '" . self::SPACED_DUMMY_MAIN_SCRIPT . "' '" . $cliInputOptionsAsString . "' worker --port 2000 --identifier 'identifier' 'src' --output-format 'json' --no-ansi",
+        ];
+
+        yield [
+            [
+                self::COMMAND => 'process',
+                Option::SOURCE => ['src'],
+                '--' . Option::OUTPUT_FORMAT => ConsoleOutputFormatter::NAME,
+                '--' . Option::DEBUG => true,
+            ],
+            "'" . PHP_BINARY . "' '" . self::SPACED_DUMMY_MAIN_SCRIPT . "' '" . $cliInputOptionsAsString . "' worker --debug --port 2000 --identifier 'identifier' 'src' --output-format 'json' --no-ansi",
+        ];
+    }
+
     /**
      * @param array<string, mixed> $inputParameters
      */

diff --git a/packages/Parallel/Command/WorkerCommandLineFactory.php b/packages/Parallel/Command/WorkerCommandLineFactory.php
@@ -6,6 +6,7 @@
 
 use Rector\ChangesReporting\Output\JsonOutputFormatter;
 use Rector\Core\Configuration\Option;
+use Rector\Core\FileSystem\FilePathHelper;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symplify\EasyParallel\Exception\ParallelShouldNotHappenException;
@@ -22,11 +23,11 @@ final class WorkerCommandLineFactory
      */
     private const OPTION_DASHES = '--';
 
-    private readonly CommandFromReflectionFactory $commandFromReflectionFactory;
-
-    public function __construct()
+    public function __construct(
+        private readonly CommandFromReflectionFactory $commandFromReflectionFactory,
+        private readonly FilePathHelper $filePathHelper
+    )
     {
-        $this->commandFromReflectionFactory = new CommandFromReflectionFactory();
     }
 
     /**
@@ -110,7 +111,8 @@ public function create(
              *
              * tested in macOS and Ubuntu (github action)
              */
-            $workerCommandArray[] = escapeshellarg((string) $input->getOption(Option::CONFIG));
+            $config = (string) $input->getOption(Option::CONFIG);
+            $workerCommandArray[] = escapeshellarg($this->filePathHelper->relativePath($config));
         }
 
         return implode(' ', $workerCommandArray);