Merge branch '4.4' into 5.2

chalasr · chalasr · commit 24e298f0ed39 · 2021-04-08T12:27:02.000+02:00
* 4.4:
  [PHPDoc] Fix some union type cases
diff --git a/DataCollector/SecurityDataCollector.php b/DataCollector/SecurityDataCollector.php
@@ -367,7 +367,7 @@ public function getAccessDecisionLog()
     /**
      * Returns the configuration of the current firewall context.
      *
-     * @return array|Data
+     * @return array|Data|null
      */
     public function getFirewall()
     {

Original file line number	Diff line number	Diff line change
`@@ -367,7 +367,7 @@ public function getAccessDecisionLog()`
`367`	`367`	`/**`
`368`	`368`	`* Returns the configuration of the current firewall context.`
`369`	`369`	`*`
`370`		`- * @return array\|Data`
	`370`	`+ * @return array\|Data\|null`
`371`	`371`	`*/`
`372`	`372`	`public function getFirewall()`
`373`	`373`	`{`