Skip to content

Commit a60c09c

Browse files
committed
Merge branch '2.7' into 2.8
* 2.7: fixed CS [DomCrawler] Dont use LIBXML_PARSEHUGE by default [Filesystem] Reduce complexity of ->remove() added tests for non-trusted proxies add 'guid' to list of exception to filter out Ensure backend slashes for symlinks on Windows systems [Filesystem] Try to delete broken symlinks fixed tests [FrameworkBundle] Test that ObjectNormalizer is registered
2 parents d593c30 + 137678a commit a60c09c

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

Form/ChoiceList/ORMQueryBuilderLoader.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,13 @@ public function getEntitiesByIds($identifier, array $values)
106106
$values = array_values(array_filter($values, function ($v) {
107107
return (string) $v === (string) (int) $v;
108108
}));
109+
} elseif ('guid' === $metadata->getTypeOfField($identifier)) {
110+
$parameterType = Connection::PARAM_STR_ARRAY;
111+
112+
// Like above, but we just filter out empty strings.
113+
$values = array_values(array_filter($values, function ($v) {
114+
return (string) $v !== '';
115+
}));
109116
} else {
110117
$parameterType = Connection::PARAM_STR_ARRAY;
111118
}

0 commit comments

Comments
 (0)