Merge branch '4.1'

nicolas-grekas · nicolas-grekas · commit 0a26a2eadf8d · 2018-10-31T11:56:31.000+01:00
* 4.1:
  [DependencyInjection] Fix tags on multiple decorated service
  fix merge
  SCA: reverted code style changes
  SCA: reverted code style changes
  SCA: applied requested code style changes
  SCA: simplify some ifs in favour of null coalescing operator
diff --git a/Helper/Table.php b/Helper/Table.php
@@ -185,11 +185,7 @@ public function setColumnStyle($columnIndex, $name)
      */
     public function getColumnStyle($columnIndex)
     {
-        if (isset($this->columnStyles[$columnIndex])) {
-            return $this->columnStyles[$columnIndex];
-        }
-
-        return $this->getStyle();
+        return $this->columnStyles[$columnIndex] ?? $this->getStyle();
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -185,11 +185,7 @@ public function setColumnStyle($columnIndex, $name)`
`185`	`185`	`*/`
`186`	`186`	`public function getColumnStyle($columnIndex)`
`187`	`187`	`{`
`188`		`- if (isset($this->columnStyles[$columnIndex])) {`
`189`		`- return $this->columnStyles[$columnIndex];`
`190`		`- }`
`191`		`-`
`192`		`- return $this->getStyle();`
	`188`	`+ return $this->columnStyles[$columnIndex] ?? $this->getStyle();`
`193`	`189`	`}`
`194`	`190`
`195`	`191`	`/**`