Merge branch '2.8' into 3.3

* 2.8: Username and password in basic auth are allowed to contain '.' Remove obsolete PHPDoc from UriSigner [Serializer] ObjectNormalizer: throw if PropertyAccess isn't installed [PropertyInfo] Add support for the iterable type pdo session fix Fixed unsetting from loosely equal keys OrderedHashMap [Debug] Fix same vendor detection in class loader Updated the source text and translation reject remember-me token if user check fails
symfony · Oct 18, 2017 · c75c4de · c75c4de
2 parents af5aa5c + 36487dd
commit c75c4de
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 5 deletions.
diff --git a/Resources/translations/validators.sv.xlf b/Resources/translations/validators.sv.xlf
@@ -11,8 +11,8 @@
                 <target>Den uppladdade filen var för stor. Försök ladda upp en mindre fil.</target>
             </trans-unit>
             <trans-unit id="30">
-                <source>The CSRF token is invalid.</source>
-                <target>CSRF-symbolen är inte giltig.</target>
+                <source>The CSRF token is invalid. Please try to resubmit the form.</source>
+                <target>CSRF-elementet är inte giltigt. Försök att skicka formuläret igen.</target>
             </trans-unit>
         </body>
     </file>

diff --git a/Tests/Util/OrderedHashMapTest.php b/Tests/Util/OrderedHashMapTest.php
@@ -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();

diff --git a/Util/OrderedHashMap.php b/Util/OrderedHashMap.php
@@ -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]);
 

diff --git a/Util/OrderedHashMapIterator.php b/Util/OrderedHashMapIterator.php
@@ -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);
     }
 
     /**