[Console] fixed output escaping when using the process helper

Author: fabpot

Helper/ProcessHelper.php

@@ -48,7 +48,7 @@ public function run(OutputInterface $output, $cmd, $error = null, $callback = nu
         }
 
         if ($verbosity <= $output->getVerbosity()) {
-            $output->write($formatter->start(spl_object_hash($process), $process->getCommandLine()));
+            $output->write($formatter->start(spl_object_hash($process), $this->escapeString($process->getCommandLine())));
         }
 
         if ($output->isDebug()) {
@@ -63,7 +63,7 @@ public function run(OutputInterface $output, $cmd, $error = null, $callback = nu
         }
 
         if (!$process->isSuccessful() && null !== $error) {
-            $output->writeln(sprintf('<error>%s</error>', $error));
+            $output->writeln(sprintf('<error>%s</error>', $this->escapeString($error)));
         }
 
         return $process;
@@ -111,15 +111,26 @@ public function wrapCallback(OutputInterface $output, Process $process, $callbac
     {
         $formatter = $this->getHelperSet()->get('debug_formatter');
 
-        return function ($type, $buffer) use ($output, $process, $callback, $formatter) {
-            $output->write($formatter->progress(spl_object_hash($process), $buffer, Process::ERR === $type));
+        $that = $this;
+        return function ($type, $buffer) use ($output, $process, $callback, $formatter, $that) {
+            $output->write($formatter->progress(spl_object_hash($process), $that->escapeString($buffer), Process::ERR === $type));
 
             if (null !== $callback) {
                 call_user_func($callback, $type, $buffer);
             }
         };
     }
 
+    /**
+     * This method is public for PHP 5.3 compatibility, it should be private.
+     *
+     * @internal
+     */
+    public function escapeString($str)
+    {
+        return str_replace('<', '\\<', $str);
+    }
+
     /**
      * {@inheritdoc}
      */

Tests/Helper/ProcessHelperTest.php

@@ -57,6 +57,12 @@ public function provideCommandsAndOutput()
   OUT  42
   RES  Command ran successfully
 
+EOT;
+        $successOutputDebugWithTags = <<<EOT
+  RUN  php -r "echo \"<info>42</info>\";"
+  OUT  <info>42</info>
+  RES  Command ran successfully
+
 EOT;
         $successOutputProcessDebug = <<<EOT
   RUN  'php' '-r' 'echo 42;'
@@ -86,6 +92,7 @@ public function provideCommandsAndOutput()
             array('', 'php -r "echo 42;"', StreamOutput::VERBOSITY_VERBOSE, null),
             array($successOutputVerbose, 'php -r "echo 42;"', StreamOutput::VERBOSITY_VERY_VERBOSE, null),
             array($successOutputDebug, 'php -r "echo 42;"', StreamOutput::VERBOSITY_DEBUG, null),
+            array($successOutputDebugWithTags, 'php -r "echo \"<info>42</info>\";"', StreamOutput::VERBOSITY_DEBUG, null),
             array('', 'php -r "syntax error"', StreamOutput::VERBOSITY_VERBOSE, null),
             array($syntaxErrorOutputVerbose, 'php -r "fwrite(STDERR, \'error message\');usleep(50000);fwrite(STDOUT, \'out message\');exit(252);"', StreamOutput::VERBOSITY_VERY_VERBOSE, null),
             array($syntaxErrorOutputDebug, 'php -r "fwrite(STDERR, \'error message\');usleep(50000);fwrite(STDOUT, \'out message\');exit(252);"', StreamOutput::VERBOSITY_DEBUG, null),