Merge branch '5.2' into 5.x

chalasr · chalasr · commit 9470371dba6b · 2021-03-28T19:35:24.000+02:00
* 5.2:
  [Security] Use more concrete user classes in tests
  fix docblock
diff --git a/DataCollector/ConfigDataCollector.php b/DataCollector/ConfigDataCollector.php
@@ -219,7 +219,7 @@ public function getEnv()
     /**
      * Returns true if the debug is enabled.
      *
-     * @return bool true if debug is enabled, false otherwise
+     * @return bool|string true if debug is enabled, false otherwise or a string if no kernel was set
      */
     public function isDebug()
     {

Original file line number	Diff line number	Diff line change
`@@ -219,7 +219,7 @@ public function getEnv()`
`219`	`219`	`/**`
`220`	`220`	`* Returns true if the debug is enabled.`
`221`	`221`	`*`
`222`		`- * @return bool true if debug is enabled, false otherwise`
	`222`	`+ * @return bool\|string true if debug is enabled, false otherwise or a string if no kernel was set`
`223`	`223`	`*/`
`224`	`224`	`public function isDebug()`
`225`	`225`	`{`