Removed generator in favour of array

strictify · Apr 12, 2021 · 249bd83 · 249bd83
1 parent 38fc815
commit 249bd83
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/src/Accessor/CollectionMapper.php b/src/Accessor/CollectionMapper.php
@@ -105,7 +105,8 @@ private function getExtraValues(callable $compare, array $originalValues, array
         /** @var array<array-key, object|array> $extraValues */
         $extraValues = [];
         foreach ($submittedValues as $key => $value) {
-            $searchKey = array_search($value, $originalValues, true);
+//            $searchKey = array_search($value, $originalValues, true);
+            $searchKey = $this->search($compare, $key, $value, $originalValues);
 
             if (false === $searchKey || $key !== $searchKey || !$this->isEqual($compare, $originalValues[$searchKey], $value)) {
                 $extraValues[$key] = $value;
@@ -115,6 +116,17 @@ private function getExtraValues(callable $compare, array $originalValues, array
         return $extraValues;
     }
 
+    private function search(callable $compare, $key, $value, $originalValues)
+    {
+        foreach ($originalValues as $originalKey => $originalValue) {
+            if ($value && $originalValue && $compare($value, $originalValue, $key, $originalKey) === true) {
+                return $key;
+            }
+        }
+
+        return false;
+    }
+
     private function extractRemoveEntryFromCollection(FormInterface $form): ?\Closure
     {
         foreach ($form as $child) {