Merge branch '5.2' into 5.x

chalasr · chalasr · commit c3d5f1ae83e4 · 2021-04-08T12:31:48.000+02:00
* 5.2:
  [PHPDoc] Fix some union type cases
diff --git a/DataCollector/SecurityDataCollector.php b/DataCollector/SecurityDataCollector.php
@@ -370,7 +370,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
`@@ -370,7 +370,7 @@ public function getAccessDecisionLog()`
`370`	`370`	`/**`
`371`	`371`	`* Returns the configuration of the current firewall context.`
`372`	`372`	`*`
`373`		`- * @return array\|Data`
	`373`	`+ * @return array\|Data\|null`
`374`	`374`	`*/`
`375`	`375`	`public function getFirewall()`
`376`	`376`	`{`