symfony
diff --git a/‎src/Symfony/Component/Form/Tests/Util/OrderedHashMapTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Tests/Util/OrderedHashMapTest.php
+20Lines changed: 20 additions & 0 deletions b/‎src/Symfony/Component/Form/Tests/Util/OrderedHashMapTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Tests/Util/OrderedHashMapTest.php
+20Lines changed: 20 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Form/Util/OrderedHashMap.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Util/OrderedHashMap.php
+2-2Lines changed: 2 additions & 2 deletions b/‎src/Symfony/Component/Form/Util/OrderedHashMap.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Util/OrderedHashMap.php
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎src/Symfony/Component/Form/Util/OrderedHashMapIterator.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Util/OrderedHashMapIterator.php
+7-1Lines changed: 7 additions & 1 deletion b/‎src/Symfony/Component/Form/Util/OrderedHashMapIterator.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Util/OrderedHashMapIterator.php
+7-1Lines changed: 7 additions & 1 deletion
@@ -56,6 +56,15 @@ public function testInsertNullKeys()
         $this->assertSame(array(0 => 1, 'foo' => 2, 1 => 3), iterator_to_array($map));
     }
 
+    public function testInsertLooselyEqualKeys()
+    {
+        $map = new OrderedHashMap();
+        $map['1 as a string'] = '1 as a string';
+        $map[1] = 1;
+
+        $this->assertSame(array('1 as a string' => '1 as a string', 1 => 1), iterator_to_array($map));
+    }
+
     /**
      * Updates should not change the position of an element, otherwise we could
      * turn foreach loops into endless loops if they change the current
@@ -111,6 +120,17 @@ public function testUnset()
         $this->assertSame(array('second' => 2), iterator_to_array($map));
     }
 
+    public function testUnsetFromLooselyEqualKeysHashMap()
+    {
+        $map = new OrderedHashMap();
+        $map['1 as a string'] = '1 as a string';
+        $map[1] = 1;
+
+        unset($map[1]);
+
+        $this->assertSame(array('1 as a string' => '1 as a string'), iterator_to_array($map));
+    }
+
     public function testUnsetNonExistingSucceeds()
     {
         $map = new OrderedHashMap();
 
@@ -133,7 +133,7 @@ public function offsetSet($key, $value)
                     : 1 + (int) max($this->orderedKeys);
             }
 
-            $this->orderedKeys[] = $key;
+            $this->orderedKeys[] = (string) $key;
         }
 
         $this->elements[$key] = $value;
@@ -144,7 +144,7 @@ public function offsetSet($key, $value)
      */
     public function offsetUnset($key)
     {
-        if (false !== ($position = array_search($key, $this->orderedKeys))) {
+        if (false !== ($position = array_search((string) $key, $this->orderedKeys))) {
             array_splice($this->orderedKeys, $position, 1);
             unset($this->elements[$key]);
 
 
@@ -118,7 +118,13 @@ public function next()
      */
     public function key()
     {
-        return $this->key;
+        if (null === $this->key) {
+            return null;
+        }
+
+        $array = array($this->key => null);
+
+        return key($array);
     }
 
     /**
Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ public function offsetSet($key, $value)`
`133`	`133`	`: 1 + (int) max($this->orderedKeys);`
`134`	`134`	`}`
`135`	`135`
`136`		`- $this->orderedKeys[] = $key;`
	`136`	`+ $this->orderedKeys[] = (string) $key;`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`$this->elements[$key] = $value;`
`@@ -144,7 +144,7 @@ public function offsetSet($key, $value)`
`144`	`144`	`*/`
`145`	`145`	`public function offsetUnset($key)`
`146`	`146`	`{`
`147`		`- if (false !== ($position = array_search($key, $this->orderedKeys))) {`
	`147`	`+ if (false !== ($position = array_search((string) $key, $this->orderedKeys))) {`
`148`	`148`	`array_splice($this->orderedKeys, $position, 1);`
`149`	`149`	`unset($this->elements[$key]);`
`150`	`150`