feature #23332 [Yaml] fix the displayed line number (fabpot, xabbuh)

fabpot · fabpot · commit 7787343c3d30 · 2017-06-30T13:20:19.000+02:00
This PR was merged into the 3.4 branch. Discussion ---------- [Yaml] fix the displayed line number | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #23294 | License | MIT | Doc PR | First, this PR backports #23294 to the `3.4` branch. Secondly, `getRealCurrentLineNb()` returns line numbers index by 0 (as they serve as array indexes internally). I removed the `getLastLineNumberBeforeDeprecation()` method added in #23294 as we can just expose the already existing `getRealCurrentLineNb()` method. Commits ------- a2ae6bf [Yaml] fix the displayed line number 1baac5a feature #23294 [Yaml][Lint] Add line numbers to JSON output. (WybrenKoelmans)
diff --git a/src/Symfony/Bridge/Twig/Command/LintCommand.php b/src/Symfony/Bridge/Twig/Command/LintCommand.php
@@ -145,7 +145,7 @@ private function validate(Environment $twig, $template, $file)
         } catch (Error $e) {
             $twig->setLoader($realLoader);
 
-            return array('template' => $template, 'file' => $file, 'valid' => false, 'exception' => $e);
+            return array('template' => $template, 'file' => $file, 'line' => $e->getTemplateLine(), 'valid' => false, 'exception' => $e);
         }
 
         return array('template' => $template, 'file' => $file, 'valid' => true);
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()->getRealCurrentLineNb() + 1);
             }
 
             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
@@ -453,9 +453,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
`@@ -145,7 +145,7 @@ private function validate(Environment $twig, $template, $file)`
`145`	`145`	`} catch (Error $e) {`
`146`	`146`	`$twig->setLoader($realLoader);`
`147`	`147`
`148`		`- return array('template' => $template, 'file' => $file, 'valid' => false, 'exception' => $e);`
	`148`	`+ return array('template' => $template, 'file' => $file, 'line' => $e->getTemplateLine(), 'valid' => false, 'exception' => $e);`
`149`	`149`	`}`
`150`	`150`
`151`	`151`	`return array('template' => $template, 'file' => $file, 'valid' => true);`
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()->getRealCurrentLineNb() + 1);`
`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
`@@ -453,9 +453,11 @@ private function parseBlock($offset, $yaml, $flags)`
`453`	`453`	`/**`
`454`	`454`	`* Returns the current line number (takes the offset into account).`
`455`	`455`	`*`
	`456`	`+ * @internal`
	`457`	`+ *`
`456`	`458`	`* @return int The current line number`
`457`	`459`	`*/`
`458`		`- private function getRealCurrentLineNb()`
	`460`	`+ public function getRealCurrentLineNb()`
`459`	`461`	`{`
`460`	`462`	`$realCurrentLineNumber = $this->currentLineNb + $this->offset;`
`461`	`463`