Merge branch '2.8' into 3.0

fabpot · fabpot · commit db204cbd5023 · 2016-07-19T12:44:15.000+02:00
* 2.8:
  Fix PHP 7.1 related failures
  [VarDumper] Fix for 7.1
  fixed CS
  Added class existence check if is_subclass_of() fails in compiler passes
  Fix the DBAL session handler version check for Postgresql
diff --git a/Helper/Table.php b/Helper/Table.php
@@ -448,7 +448,7 @@ private function fillNextRows($rows, $line)
                 }
 
                 // create a two dimensional array (rowspan x colspan)
-                $unmergedRows = array_replace_recursive(array_fill($line + 1, $nbLines, ''), $unmergedRows);
+                $unmergedRows = array_replace_recursive(array_fill($line + 1, $nbLines, array()), $unmergedRows);
                 foreach ($unmergedRows as $unmergedRowKey => $unmergedRow) {
                     $value = isset($lines[$unmergedRowKey - $line]) ? $lines[$unmergedRowKey - $line] : '';
                     $unmergedRows[$unmergedRowKey][$column] = new TableCell($value, array('colspan' => $cell->getColspan()));

Original file line number	Diff line number	Diff line change
`@@ -448,7 +448,7 @@ private function fillNextRows($rows, $line)`
`448`	`448`	`}`
`449`	`449`
`450`	`450`	`// create a two dimensional array (rowspan x colspan)`
`451`		`- $unmergedRows = array_replace_recursive(array_fill($line + 1, $nbLines, ''), $unmergedRows);`
	`451`	`+ $unmergedRows = array_replace_recursive(array_fill($line + 1, $nbLines, array()), $unmergedRows);`
`452`	`452`	`foreach ($unmergedRows as $unmergedRowKey => $unmergedRow) {`
`453`	`453`	`$value = isset($lines[$unmergedRowKey - $line]) ? $lines[$unmergedRowKey - $line] : '';`
`454`	`454`	`$unmergedRows[$unmergedRowKey][$column] = new TableCell($value, array('colspan' => $cell->getColspan()));`