Merge branch '3.4'

fabpot · fabpot · commit d7992dc1b77f · 2017-06-30T13:21:18.000+02:00
* 3.4: [Yaml] fix the displayed line number feature #23294 [Yaml][Lint] Add line numbers to JSON output. (WybrenKoelmans)
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, $this->getParser()->getLastLineNumberBeforeDeprecation());
+                throw new ParseException($message, $this->getParser()->getRealCurrentLineNb() + 1);
             }
 
             return $prevErrorHandler ? $prevErrorHandler($level, $message, $file, $line) : false;
diff --git a/src/Symfony/Component/Yaml/Parser.php b/src/Symfony/Component/Yaml/Parser.php
@@ -413,9 +413,11 @@ private function parseBlock($offset, $yaml, $flags)
     /**
      * Returns the current line number (takes the offset into account).
      *
+     * @internal
+     *
      * @return int The current line number
      */
-    private function getRealCurrentLineNb()
+    public function getRealCurrentLineNb()
     {
         $realCurrentLineNumber = $this->currentLineNb + $this->offset;
 

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, $this->getParser()->getLastLineNumberBeforeDeprecation());`
	`108`	`+ throw new ParseException($message, $this->getParser()->getRealCurrentLineNb() + 1);`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`return $prevErrorHandler ? $prevErrorHandler($level, $message, $file, $line) : false;`
Original file line number	Diff line number	Diff line change
`@@ -413,9 +413,11 @@ private function parseBlock($offset, $yaml, $flags)`
`413`	`413`	`/**`
`414`	`414`	`* Returns the current line number (takes the offset into account).`
`415`	`415`	`*`
	`416`	`+ * @internal`
	`417`	`+ *`
`416`	`418`	`* @return int The current line number`
`417`	`419`	`*/`
`418`		`- private function getRealCurrentLineNb()`
	`420`	`+ public function getRealCurrentLineNb()`
`419`	`421`	`{`
`420`	`422`	`$realCurrentLineNumber = $this->currentLineNb + $this->offset;`
`421`	`423`