Merge branch '3.1' into 3.2

nicolas-grekas · nicolas-grekas · commit c5ffbbade5c7 · 2017-01-02T15:57:35.000+01:00
* 3.1: do not depend on a fixed date in layout tests [Console] Escape default value when dumping help [Console] OS X Can't call cli_set_process_title php without superuser Fixed @return when returning this or static #bis fixed @return when returning this or static Polish translation improvement in Validator component [Console] Descriptors should use Helper::strlen [Config] Improve PHPdoc / IDE autocomplete [Debug] Wrap call to ->log in a try catch block [Debug] UndefinedMethodFatalErrorHandler - Handle anonymous classes fix merge [cache] Bump RedisAdapter timeout to 5s fixed @return when returning this or static [SecurityBundle] Made collection of user provider unique when injecting them to the RemberMeService remove is_writable check on filesystem cache
diff --git a/JsonResponse.php b/JsonResponse.php
@@ -117,7 +117,7 @@ public function setCallback($callback = null)
      *
      * @param string $json
      *
-     * @return JsonResponse
+     * @return $this
      *
      * @throws \InvalidArgumentException
      */

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ public function setCallback($callback = null)`
`117`	`117`	`*`
`118`	`118`	`* @param string $json`
`119`	`119`	`*`
`120`		`- * @return JsonResponse`
	`120`	`+ * @return $this`
`121`	`121`	`*`
`122`	`122`	`* @throws \InvalidArgumentException`
`123`	`123`	`*/`