From c953aa97afbe772383094485913e2620b3ed74dd Mon Sep 17 00:00:00 2001 From: Beno!t POLASZEK Date: Tue, 19 Jun 2018 14:29:43 +0200 Subject: [PATCH] Hotfix #657 #663 --- DependencyInjection/Compiler/CustomHandlersPass.php | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/DependencyInjection/Compiler/CustomHandlersPass.php b/DependencyInjection/Compiler/CustomHandlersPass.php index 25d770fa..2d06edba 100644 --- a/DependencyInjection/Compiler/CustomHandlersPass.php +++ b/DependencyInjection/Compiler/CustomHandlersPass.php @@ -95,12 +95,7 @@ private function sortAndFlattenHandlersList(array $allHandlers) $sorter = function ($a, $b) { return $b[3] == $a[3] ? 0 : ($b[3] > $a[3] ? 1 : -1); }; - // php 7 sorting is stable, while php 5 is not, and we need it stable to have consistent tests - if (PHP_MAJOR_VERSION < 7) { - self::stable_uasort($allHandlers, $sorter); - } else { - uasort($allHandlers, $sorter); - } + self::stable_uasort($allHandlers, $sorter); $handlers = []; foreach ($allHandlers as $handler) { list ($direction, $type, $format, $priority, $service, $method) = $handler;