From e74d54b5b58bf283b8c8a40913cf47b88f823829 Mon Sep 17 00:00:00 2001 From: Nathaniel Catchpole Date: Thu, 21 Jun 2018 20:05:20 +0100 Subject: [PATCH] Issue #2960507 by alexpott: Remove call_user_func_array from OptionsRequestSubscriber --- .../Core/EventSubscriber/OptionsRequestSubscriber.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/lib/Drupal/Core/EventSubscriber/OptionsRequestSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/OptionsRequestSubscriber.php index 3abc55c53a64..ee22937dcaad 100644 --- a/core/lib/Drupal/Core/EventSubscriber/OptionsRequestSubscriber.php +++ b/core/lib/Drupal/Core/EventSubscriber/OptionsRequestSubscriber.php @@ -46,11 +46,11 @@ class OptionsRequestSubscriber implements EventSubscriberInterface { // In case we don't have any routes, a 403 should be thrown by the normal // request handling. if (count($routes) > 0) { - $methods = array_map(function (Route $route) { - return $route->getMethods(); - }, $routes->all()); // Flatten and unique the available methods. - $methods = array_unique(call_user_func_array('array_merge', $methods)); + $methods = array_reduce($routes->all(), function ($methods, Route $route) { + return array_merge($methods, $route->getMethods()); + }, []); + $methods = array_unique($methods); $response = new Response('', 200, ['Allow' => implode(', ', $methods)]); $event->setResponse($response); }