Merge branch 'kernel' into kernel-ajax

core/lib/Drupal/Core/EventSubscriber/ViewSubscriber.php

@@ -3,6 +3,7 @@
 namespace Drupal\Core\EventSubscriber;
 
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@@ -30,13 +31,6 @@ public function __construct(ContentNegotiation $negotiation) {
     $this->negotiation = $negotiation;
   }
 
-  protected function createJsonResponse() {
-    $response = new Response();
-    $response->headers->set('Content-Type', 'application/json; charset=utf-8');
-
-    return $response;
-  }
-
   protected function createAjaxResponse(GetResponseEvent $event) {
     $response = new Response();
     $response->headers->set('Content-Type', 'application/json; charset=utf-8');
@@ -88,9 +82,9 @@ public function onView(GetResponseEvent $event) {
   public function onJson(GetResponseEvent $event) {
     $page_callback_result = $event->getControllerResult();
 
-    print_r($page_callback_result);
+    //print_r($page_callback_result);
 
-    $response = $this->createJsonResponse();
+    $response = new JsonResponse();
     $response->setContent($page_callback_result);
 
     return $response;