Merge branch '2.8' into 3.1

fabpot · fabpot · commit 482a67b8762f · 2016-12-29T22:40:29.000+01:00
* 2.8: fixed @return when returning this or static
diff --git a/Helper/Table.php b/Helper/Table.php
@@ -152,7 +152,7 @@ public function getStyle()
      * @param int               $columnIndex Column index
      * @param TableStyle|string $name        The style name or a TableStyle instance
      *
-     * @return Table
+     * @return self
      */
     public function setColumnStyle($columnIndex, $name)
     {

Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ public function getStyle()`
`152`	`152`	`* @param int $columnIndex Column index`
`153`	`153`	`* @param TableStyle\|string $name The style name or a TableStyle instance`
`154`	`154`	`*`
`155`		`- * @return Table`
	`155`	`+ * @return self`
`156`	`156`	`*/`
`157`	`157`	`public function setColumnStyle($columnIndex, $name)`
`158`	`158`	`{`