[Parallel] Fix missing --xdebug in WorkerCommand line on WorkerComman…

…dLineFactory when --xdebug provided (#5398) * [Parallel] Fix missing --xdebug in WorkerCommand line on WorkerCommandLineFactory when --xdebug provided * register XDEBUG to ProcessConfigureDecorator * add unit test * use XdebugHandler
rectorphp · Dec 28, 2023 · f54a79b · f54a79b
1 parent 109d734
commit f54a79b
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 1 deletion.
diff --git a/packages-tests/Parallel/Command/WorkerCommandLineFactoryTest.php b/packages-tests/Parallel/Command/WorkerCommandLineFactoryTest.php
@@ -100,6 +100,17 @@ public static function provideDataSpacedMainScript(): Iterator
             ],
             "'" . PHP_BINARY . "' '" . self::SPACED_DUMMY_MAIN_SCRIPT . "' '" . $cliInputOptionsAsString . "' worker --debug --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,
+                '--' . Option::XDEBUG => true,
+            ],
+            "'" . PHP_BINARY . "' '" . self::SPACED_DUMMY_MAIN_SCRIPT . "' '" . $cliInputOptionsAsString . "' worker --debug --xdebug --port 2000 --identifier 'identifier' 'src' --output-format 'json' --no-ansi",
+        ];
     }
 
     /**
@@ -160,6 +171,17 @@ public static function provideData(): Iterator
             ],
             "'" . PHP_BINARY . "' '" . self::DUMMY_MAIN_SCRIPT . "' '" . $cliInputOptionsAsString . "' worker --debug --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,
+                '--' . Option::XDEBUG => true,
+            ],
+            "'" . PHP_BINARY . "' '" . self::DUMMY_MAIN_SCRIPT . "' '" . $cliInputOptionsAsString . "' worker --debug --xdebug --port 2000 --identifier 'identifier' 'src' --output-format 'json' --no-ansi",
+        ];
     }
 
     private function prepareProcessCommandDefinition(): InputDefinition

diff --git a/src/Console/ConsoleApplication.php b/src/Console/ConsoleApplication.php
@@ -43,7 +43,7 @@ public function doRun(InputInterface $input, OutputInterface $output): int
     {
         // @fixes https://github.com/rectorphp/rector/issues/2205
         $isXdebugAllowed = $input->hasParameterOption('--xdebug');
-        if (! $isXdebugAllowed) {
+        if ($isXdebugAllowed) {
             $xdebugHandler = new XdebugHandler('rector');
             $xdebugHandler->check();
             unset($xdebugHandler);

diff --git a/src/Console/ProcessConfigureDecorator.php b/src/Console/ProcessConfigureDecorator.php
@@ -64,5 +64,7 @@ public static function decorate(Command $command): void
 
         $command->addOption(Option::PARALLEL_PORT, null, InputOption::VALUE_REQUIRED);
         $command->addOption(Option::PARALLEL_IDENTIFIER, null, InputOption::VALUE_REQUIRED);
+
+        $command->addOption(Option::XDEBUG, null, InputOption::VALUE_NONE, 'Display xdebug output.');
     }
 }