Security update for Core, with self-updated composer

[yaffs-website] / web / core / lib / Drupal / Core / EventSubscriber / RenderArrayNonHtmlSubscriber.php

diff --git a/web/core/lib/Drupal/Core/EventSubscriber/AcceptNegotiation406.php b/web/core/lib/Drupal/Core/EventSubscriber/RenderArrayNonHtmlSubscriber.php
similarity index 66%
rename from web/core/lib/Drupal/Core/EventSubscriber/AcceptNegotiation406.php
rename to web/core/lib/Drupal/Core/EventSubscriber/RenderArrayNonHtmlSubscriber.php
index 61309c64d5ffca10ebdc0022d8fb4879524deea2..afb9ef5b031c03eeb174d5ef50caa72b7e536d9f 100644 (file)
--- a/web/core/lib/Drupal/Core/EventSubscriber/AcceptNegotiation406.php
+++ b/web/core/lib/Drupal/Core/EventSubscriber/RenderArrayNonHtmlSubscriber.php
@@ -8,25 +8,23 @@ use Symfony\Component\HttpKernel\Exception\NotAcceptableHttpException;
 use Symfony\Component\HttpKernel\KernelEvents;
 
 /**
- * View subscriber rendering a 406 if we could not route or render a request.
- *
- * @todo fix or replace this in https://www.drupal.org/node/2364011
+ * Throws 406 if requesting non-HTML format and controller returns render array.
  */
-class AcceptNegotiation406 implements EventSubscriberInterface {
+class RenderArrayNonHtmlSubscriber implements EventSubscriberInterface {
 
   /**
-   * Throws an HTTP 406 error if we get this far, which we normally shouldn't.
+   * Throws an HTTP 406 error if client requested a non-HTML format.
    *
    * @param \Symfony\Component\HttpKernel\Event\GetResponseForControllerResultEvent $event
    *   The event to process.
    */
-  public function onViewDetect406(GetResponseForControllerResultEvent $event) {
+  public function onRespond(GetResponseForControllerResultEvent $event) {
     $request = $event->getRequest();
     $result = $event->getControllerResult();
 
     // If this is a render array then we assume that the router went with the
     // generic controller and not one with a format. If the format requested is
-    // not HTML though we can also assume that the requested format is invalid
+    // not HTML though, we can also assume that the requested format is invalid
     // so we provide a 406 response.
     if (is_array($result) && $request->getRequestFormat() !== 'html') {
       throw new NotAcceptableHttpException('Not acceptable format: ' . $request->getRequestFormat());
@@ -37,8 +35,7 @@ class AcceptNegotiation406 implements EventSubscriberInterface {
    * {@inheritdoc}
    */
   public static function getSubscribedEvents() {
-    $events[KernelEvents::VIEW][] = ['onViewDetect406', -10];
-
+    $events[KernelEvents::VIEW][] = ['onRespond', -10];
     return $events;
   }