Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Switch to the new JsonResponse object from Symfony.

8.0.x
Larry Garfield 2012-03-31 18:44:36 -05:00
parent edcc5bd57e
commit da00dcc3e6
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/lib/Drupal/Core/ExceptionController.php
View File

@ -10,6 +10,7 @@ namespace Drupal\Core;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpKernel\HttpKernelInterface; use Symfony\Component\HttpKernel\HttpKernelInterface;
use Symfony\Component\EventDispatcher\EventDispatcher; use Symfony\Component\EventDispatcher\EventDispatcher;
@ -41,7 +42,7 @@ class ExceptionController {
/** /**
* Constructor * Constructor
* *
* @param HttpKernelInterface $kernel * @param HttpKernelInterface $kernel
* The kernel that spawned this controller, so that it can be reused * The kernel that spawned this controller, so that it can be reused
* for subrequests. * for subrequests.
@ -169,13 +170,6 @@ class ExceptionController {
return $response; return $response;
} }
protected function createJsonResponse() {
$response = new Response();
$response->headers->set('Content-Type', 'application/json; charset=utf-8');
return $response;
}
/** /**
* Processes an AccessDenied exception into an HTTP 403 response. * Processes an AccessDenied exception into an HTTP 403 response.
* *
@ -183,7 +177,7 @@ class ExceptionController {
* The Event to process. * The Event to process.
*/ */
public function on403Json(FlattenException $exception, Request $request) { public function on403Json(FlattenException $exception, Request $request) {
$response = $this->createJsonResponse(); $response = new JsonResponse();
$response->setStatusCode(403, 'Access Denied'); $response->setStatusCode(403, 'Access Denied');
return $response; return $response;
} }
@ -195,7 +189,7 @@ class ExceptionController {
* The Event to process. * The Event to process.
*/ */
public function on404Json(FlattenException $exception, Request $request) { public function on404Json(FlattenException $exception, Request $request) {
$response = $this->createJsonResponse(); $response = new JsonResponse();
$response->setStatusCode(404, 'Not Found'); $response->setStatusCode(404, 'Not Found');
return $response; return $response;
} }
@ -207,7 +201,7 @@ class ExceptionController {
* The Event to process. * The Event to process.
*/ */
public function on405Json(FlattenException $exception, Request $request) { public function on405Json(FlattenException $exception, Request $request) {
$response = $this->createJsonResponse(); $response = new JsonResponse();
$response->setStatusCode(405, 'Method Not Allowed'); $response->setStatusCode(405, 'Method Not Allowed');
return $response; return $response;
} }