From 839cbfc45ffae6fc7c17697b9ebf9458a2df056d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guillaume=20Perr=C3=A9al?= <guillaume.perreal@irstea.fr>
Date: Tue, 17 May 2016 09:46:04 +0200
Subject: [PATCH] Correction de la normalisation des filtres.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
On perdait les clefs, ce qui rendait les filtres inopérants.
---
DependencyInjection/Builder/ClassFilterBuilder.php | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/DependencyInjection/Builder/ClassFilterBuilder.php b/DependencyInjection/Builder/ClassFilterBuilder.php
index c0c50c5..88c7363 100644
--- a/DependencyInjection/Builder/ClassFilterBuilder.php
+++ b/DependencyInjection/Builder/ClassFilterBuilder.php
@@ -80,16 +80,24 @@ class ClassFilterBuilder
}
if (is_array($data)) {
$res = [];
+ $isList = true;
foreach($data as $k => $v) {
$normalized = $this->normalize($v);
if (!empty($normalized)) {
$res[$k] = $normalized;
+ if (!is_int($k)) {
+ $isList = false;
+ }
}
}
if (empty($res)) {
return null;
}
- sort($res);
+ if ($isList) {
+ sort($res);
+ } else {
+ ksort($res);
+ }
return $res;
}
return $data;
--
GitLab