Skip to content

Commit c63567b

Browse files
Merge branch '3.2'
* 3.2: 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
2 parents 2aef6a3 + c5ffbba commit c63567b

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

JsonResponse.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ public function setCallback($callback = null)
117117
*
118118
* @param string $json
119119
*
120-
* @return JsonResponse
120+
* @return $this
121121
*
122122
* @throws \InvalidArgumentException
123123
*/

0 commit comments

Comments
 (0)