Merge branch '2.8' into 3.3

nicolas-grekas · nicolas-grekas · commit 87305530dee2 · 2017-11-07T12:58:40.000+01:00
* 2.8:
  Docblock fixes
diff --git a/Extension/CodeExtension.php b/Extension/CodeExtension.php
@@ -196,7 +196,7 @@ public function formatFile($file, $line, $text = null)
      * @param string $file An absolute file path
      * @param int    $line The line number
      *
-     * @return string A link of false
+     * @return string|false A link or false
      */
     public function getFileLink($file, $line)
     {

Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ public function formatFile($file, $line, $text = null)`
`196`	`196`	`* @param string $file An absolute file path`
`197`	`197`	`* @param int $line The line number`
`198`	`198`	`*`
`199`		`- * @return string A link of false`
	`199`	`+ * @return string\|false A link or false`
`200`	`200`	`*/`
`201`	`201`	`public function getFileLink($file, $line)`
`202`	`202`	`{`