bug FriendsOfPHP#149 fixed parsing error display when using --no-ansi…

… (fabpot) This PR was merged into the 3.0-dev branch. Discussion ---------- fixed parsing error display when using --no-ansi fixes #117 Commits ------- a6a4aec updated the error message for phpdocs issues to include the file name 7bf80c5 fixed parsing error display when using --no-ansi
NightFox7 · Feb 18, 2015 · 3aaa667 · 3aaa667
2 parents d6b2780 + a6a4aec
commit 3aaa667
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 13 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -3,6 +3,7 @@ CHANGELOG
 
 * 3.0.1 (2015-XX-XX)
 
+  * fixed parsing error display when using --no-ansi
   * fixed tag parsing when the value is already an array
 
 * 3.0.0 (2015-02-17)

diff --git a/Sami/Console/Command/Command.php b/Sami/Console/Command/Command.php
@@ -82,18 +82,14 @@ public function update(Project $project)
 
     public function parse(Project $project)
     {
-        $callback = $this->output->isDecorated() ? array($this, 'messageCallback') : null;
-
-        $project->parse($callback, $this->input->getOption('force'));
+        $project->parse(array($this, 'messageCallback'), $this->input->getOption('force'));
 
         $this->displayParseSummary();
     }
 
     public function render(Project $project)
     {
-        $callback = $this->output->isDecorated() ? array($this, 'messageCallback') : null;
-
-        $project->render($callback, $this->input->getOption('force'));
+        $project->render(array($this, 'messageCallback'), $this->input->getOption('force'));
 
         $this->displayRenderSummary();
     }
@@ -143,11 +139,11 @@ public function renderProgressBar($percent, $length)
     public function displayParseProgress($progress, $class)
     {
         if ($this->started) {
-            $this->output->write("\033[2A");
+            $this->output->isDecorated() and $this->output->write("\033[2A");
         }
         $this->started = true;
 
-        $this->output->write(sprintf(
+        $this->output->isDecorated() and $this->output->write(sprintf(
             "  Parsing <comment>%s</comment>%s\033[K\n          %s\033[K\n",
             $this->renderProgressBar($progress, 50), count($this->errors) ? ' <fg=red>'.count($this->errors).' error'.(1 == count($this->errors) ? '' : 's').'</>' : '', $class->getName())
         );
@@ -156,11 +152,11 @@ public function displayParseProgress($progress, $class)
     public function displayRenderProgress($section, $message, $progression)
     {
         if ($this->started) {
-            $this->output->write("\033[2A");
+            $this->output->isDecorated() and $this->output->write("\033[2A");
         }
         $this->started = true;
 
-        $this->output->write(sprintf(
+        $this->output->isDecorated() and $this->output->write(sprintf(
             "  Rendering <comment>%s</comment>\033[K\n            <info>%s</info> %s\033[K\n",
             $this->renderProgressBar($progression, 50), $section, $message
         ));
@@ -172,7 +168,7 @@ public function displayParseEnd(Transaction $transaction)
             return;
         }
 
-        $this->output->write(sprintf("\033[2A<info>  Parsing   done</info>\033[K\n\033[K\n\033[1A", count($this->errors) ? ' <fg=red>'.count($this->errors).' errors</>' : ''));
+        $this->output->isDecorated() and $this->output->write(sprintf("\033[2A<info>  Parsing   done</info>\033[K\n\033[K\n\033[1A", count($this->errors) ? ' <fg=red>'.count($this->errors).' errors</>' : ''));
 
         if ($this->input->getOption('verbose') && count($this->errors)) {
             foreach ($this->errors as $error) {
@@ -189,7 +185,7 @@ public function displayRenderEnd(Diff $diff)
             return;
         }
 
-        $this->output->write("\033[2A<info>  Rendering done</info>\033[K\n\033[K\n\033[1A");
+        $this->output->isDecorated() and $this->output->write("\033[2A<info>  Rendering done</info>\033[K\n\033[K\n\033[1A");
     }
 
     public function displayParseSummary()

diff --git a/Sami/Parser/ParserContext.php b/Sami/Parser/ParserContext.php
@@ -95,7 +95,7 @@ public function addErrors($name, $line, array $errors)
 
     public function addError($name, $line, $error)
     {
-        $this->errors[] = sprintf('An error occurred while parsing "%s" line "%d": %s', $name, $line, $error);
+        $this->errors[] = sprintf('%s on "%s" in %s:%d', $error, $name, $this->file, $line);
     }
 
     public function getErrors()