Merge branch '2.7' into 2.8

nicolas-grekas · nicolas-grekas · commit 65dd18c34c5e · 2017-11-07T12:56:23.000+01:00
* 2.7:
  Docblock fixes
diff --git a/Extension/CodeExtension.php b/Extension/CodeExtension.php
@@ -193,7 +193,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
`@@ -193,7 +193,7 @@ public function formatFile($file, $line, $text = null)`
`193`	`193`	`* @param string $file An absolute file path`
`194`	`194`	`* @param int $line The line number`
`195`	`195`	`*`
`196`		`- * @return string A link of false`
	`196`	`+ * @return string\|false A link or false`
`197`	`197`	`*/`
`198`	`198`	`public function getFileLink($file, $line)`
`199`	`199`	`{`