Merge branch '3.4'

* 3.4: (26 commits)
  [Routing] Fix resource miss
  [Security] Fixed auth provider authenticate() cannot return void
  [FrameworkBundle][Serializer] Move DateIntervalNormalizer definition to xml
  declare argument type
  Improving annotation loader message
  [FrameworkBundle][Serializer] Move normalizer/encoders definitions to xml file & remove unnecessary checks
  Update UPGRADE-4.0.md
  streamed response should return $this
  $isClientIpsVali is not used
  [WebServerBundle] Prevent commands from being registered by convention
  content can be a resource
  Adding the Form default theme files to be warmed up in Twig's cache
  Remove BC Break label from `NullDumper` class
  Username and password in basic auth are allowed to contain '.'
  Remove obsolete PHPDoc from UriSigner
  [Serializer] YamlEncoder: throw if the Yaml component isn't installed
  [Serializer] ObjectNormalizer: throw if PropertyAccess isn't installed
  [PropertyInfo] Add support for the iterable type
  pdo session fix
  Fixed pathinfo calculation for requests starting with a question mark.  - fix bad conflict resolving issue  - port symfony/symfony#21968 to 3.3+
  ...

Author: nicolas-grekas

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>

Tests/ButtonBuilderTest.php

@@ -13,6 +13,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Form\ButtonBuilder;
+use Symfony\Component\Form\Exception\InvalidArgumentException;
 
 /**
  * @author Alexander Cheprasov <[email protected]>
@@ -53,10 +54,12 @@ public function getInvalidNames()
      */
     public function testInvalidNames($name)
     {
-        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(
-            '\Symfony\Component\Form\Exception\InvalidArgumentException',
-            'Buttons cannot have empty names.'
-        );
+        if (method_exists($this, 'expectException')) {
+            $this->expectException(InvalidArgumentException::class);
+            $this->expectExceptionMessage('Buttons cannot have empty names.');
+        } else {
+            $this->setExpectedException(InvalidArgumentException::class, 'Buttons cannot have empty names.');
+        }
         new ButtonBuilder($name);
     }
 }

Tests/Extension/Core/DataTransformer/DateIntervalToArrayTransformerTest.php

@@ -181,7 +181,12 @@ public function testReverseTransformWithEmptyFields()
             'minutes' => '',
             'seconds' => '6',
         );
-        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(TransformationFailedException::class, 'This amount of "minutes" is invalid');
+        if (method_exists($this, 'expectException')) {
+            $this->expectException(TransformationFailedException::class);
+            $this->expectExceptionMessage('This amount of "minutes" is invalid');
+        } else {
+            $this->setExpectedException(TransformationFailedException::class, 'This amount of "minutes" is invalid');
+        }
         $transformer->reverseTransform($input);
     }
 
@@ -191,7 +196,12 @@ public function testReverseTransformWithWrongInvertType()
         $input = array(
             'invert' => '1',
         );
-        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(TransformationFailedException::class, 'The value of "invert" must be boolean');
+        if (method_exists($this, 'expectException')) {
+            $this->expectException(TransformationFailedException::class);
+            $this->expectExceptionMessage('The value of "invert" must be boolean');
+        } else {
+            $this->setExpectedException(TransformationFailedException::class, 'The value of "invert" must be boolean');
+        }
         $transformer->reverseTransform($input);
     }
 

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();

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]);
 

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);
     }
 
     /**