Merge pull request #122 from tienvx/fix-cant-reduce-path

Fix can't reduce path
tienvx · Dec 25, 2018 · c353944 · c353944
2 parents 8d4579a + c8501eb
commit c353944
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/src/Command/CommandRunner.php b/src/Command/CommandRunner.php
@@ -35,9 +35,10 @@ public function run(array $parameters)
         $process->setTimeout(null);
         $process->setWorkingDirectory($this->kernel->getProjectDir());
 
-        $process->run();
+        $exitCode = $process->run();
 
-        if ($error = $process->getErrorOutput()) {
+        if ($exitCode) {
+            $error = $process->getErrorOutput();
             $this->logger->error($error);
         }
     }

diff --git a/src/Command/ReducePathCommand.php b/src/Command/ReducePathCommand.php
@@ -41,7 +41,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
     {
         $bugId = $input->getArgument('bug-id');
         $reducer = $input->getArgument('reducer');
-        $data = json_decode($input->getArgument('data'), true);
+        $data = $input->getArgument('data');
+        $data = json_decode(trim($data, "'"), true);
         $message = new ReductionMessage($bugId, $reducer, $data);
 
         $this->setAnonymousToken();

diff --git a/src/MessageHandler/ReductionMessageHandler.php b/src/MessageHandler/ReductionMessageHandler.php
@@ -28,6 +28,6 @@ public function __invoke(ReductionMessage $message)
         $bugId = $message->getBugId();
         $reducer = $message->getReducer();
         $data = $message->getData();
-        $this->commandRunner->run(['mbt:path:reduce', $bugId, $reducer, "'" . json_encode($data) . "'"]);
+        $this->commandRunner->run(['mbt:path:reduce', $bugId, $reducer, json_encode($data)]);
     }
 }
diff --git a/tests/app/src/Command/CommandRunner.php b/tests/app/src/Command/CommandRunner.php
@@ -17,6 +17,9 @@ public function run(array $parameters)
     {
         $application = new Application($this->kernel);
         $application->setAutoExit(false);
+        if ($parameters[0] === 'mbt:path:reduce') {
+            $parameters[3] = "'{$parameters[3]}'";
+        }
         $application->run(new StringInput(implode(' ', $parameters)), new NullOutput());
     }
 }