[Yaml][Lint] Add line numbers to JSON output.

WybrenKoelmans · WybrenKoelmans · commit 684f62ee495e · 2017-06-27T00:51:50.000+02:00
- added line numbers for deprecations and for JSON output
diff --git a/src/Symfony/Component/Yaml/Command/LintCommand.php b/src/Symfony/Component/Yaml/Command/LintCommand.php
@@ -105,7 +105,7 @@ private function validate($content, $file = null)
     {
         $prevErrorHandler = set_error_handler(function ($level, $message, $file, $line) use (&$prevErrorHandler) {
             if (E_USER_DEPRECATED === $level) {
-                throw new ParseException($message);
+                throw new ParseException($message, $this->getParser()->getLastLineNumberBeforeDeprecation());
             }
 
             return $prevErrorHandler ? $prevErrorHandler($level, $message, $file, $line) : false;
@@ -114,7 +114,7 @@ private function validate($content, $file = null)
         try {
             $this->getParser()->parse($content, Yaml::PARSE_CONSTANT);
         } catch (ParseException $e) {
-            return array('file' => $file, 'valid' => false, 'message' => $e->getMessage());
+            return array('file' => $file, 'line' => $e->getParsedLine(), 'valid' => false, 'message' => $e->getMessage());
         } finally {
             restore_error_handler();
         }
diff --git a/src/Symfony/Component/Yaml/Parser.php b/src/Symfony/Component/Yaml/Parser.php
@@ -75,6 +75,14 @@ public function parse($value, $flags = 0)
         return $data;
     }
 
+    /**
+     * @return int
+     */
+    public function getLastLineNumberBeforeDeprecation()
+    {
+        return $this->getRealCurrentLineNb();
+    }
+
     private function doParse($value, $flags)
     {
         $this->currentLineNb = -1;

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ private function validate($content, $file = null)`
`105`	`105`	`{`
`106`	`106`	`$prevErrorHandler = set_error_handler(function ($level, $message, $file, $line) use (&$prevErrorHandler) {`
`107`	`107`	`if (E_USER_DEPRECATED === $level) {`
`108`		`- throw new ParseException($message);`
	`108`	`+ throw new ParseException($message, $this->getParser()->getLastLineNumberBeforeDeprecation());`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`return $prevErrorHandler ? $prevErrorHandler($level, $message, $file, $line) : false;`
`@@ -114,7 +114,7 @@ private function validate($content, $file = null)`
`114`	`114`	`try {`
`115`	`115`	`$this->getParser()->parse($content, Yaml::PARSE_CONSTANT);`
`116`	`116`	`} catch (ParseException $e) {`
`117`		`- return array('file' => $file, 'valid' => false, 'message' => $e->getMessage());`
	`117`	`+ return array('file' => $file, 'line' => $e->getParsedLine(), 'valid' => false, 'message' => $e->getMessage());`
`118`	`118`	`} finally {`
`119`	`119`	`restore_error_handler();`
`120`	`120`	`}`
Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,14 @@ public function parse($value, $flags = 0)`
`75`	`75`	`return $data;`
`76`	`76`	`}`
`77`	`77`
	`78`	`+ /**`
	`79`	`+ * @return int`
	`80`	`+ */`
	`81`	`+ public function getLastLineNumberBeforeDeprecation()`
	`82`	`+ {`
	`83`	`+ return $this->getRealCurrentLineNb();`
	`84`	`+ }`
	`85`	`+`
`78`	`86`	`private function doParse($value, $flags)`
`79`	`87`	`{`
`80`	`88`	`$this->currentLineNb = -1;`