Merge branch '2.7' into 2.8

* 2.7:
  Username and password in basic auth are allowed to contain '.'
  Remove obsolete PHPDoc from UriSigner
  [Serializer] ObjectNormalizer: throw if PropertyAccess isn't installed
  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

Author: fabpot

src/Symfony/Component/Debug/DebugClassLoader.php

@@ -203,18 +203,11 @@ public function loadClass($class)
             } elseif (preg_match('#\n \* @deprecated (.*?)\r?\n \*(?: @|/$)#s', $refl->getDocComment(), $notice)) {
                 self::$deprecated[$name] = preg_replace('#\s*\r?\n \* +#', ' ', $notice[1]);
             } else {
-                if (2 > $len = 1 + (strpos($name, '\\', 1 + strpos($name, '\\')) ?: strpos($name, '_'))) {
+                if (2 > $len = 1 + (strpos($name, '\\') ?: strpos($name, '_'))) {
                     $len = 0;
                     $ns = '';
                 } else {
-                    switch ($ns = substr($name, 0, $len)) {
-                        case 'Symfony\Bridge\\':
-                        case 'Symfony\Bundle\\':
-                        case 'Symfony\Component\\':
-                            $ns = 'Symfony\\';
-                            $len = strlen($ns);
-                            break;
-                    }
+                    $ns = substr($name, 0, $len);
                 }
                 $parent = get_parent_class($class);
 

src/Symfony/Component/Form/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>

src/Symfony/Component/Form/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();

src/Symfony/Component/Form/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]);
 

src/Symfony/Component/Form/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);
     }
 
     /**

src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php

@@ -387,7 +387,7 @@ public function close()
             $this->gcCalled = false;
 
             // delete the session records that have expired
-            $sql = "DELETE FROM $this->table WHERE $this->lifetimeCol + $this->timeCol < :time";
+            $sql = "DELETE FROM $this->table WHERE $this->lifetimeCol < :time - $this->timeCol";
 
             $stmt = $this->pdo->prepare($sql);
             $stmt->bindValue(':time', time(), \PDO::PARAM_INT);

src/Symfony/Component/HttpKernel/UriSigner.php

@@ -55,10 +55,6 @@ public function sign($uri)
     /**
      * Checks that a URI contains the correct hash.
      *
-     * The _hash query string parameter must be the last one
-     * (as it is generated that way by the sign() method, it should
-     * never be a problem).
-     *
      * @param string $uri A signed URI
      *
      * @return bool True if the URI is signed correctly, false otherwise

src/Symfony/Component/Security/Core/Authentication/Provider/RememberMeAuthenticationProvider.php

@@ -49,6 +49,7 @@ public function authenticate(TokenInterface $token)
 
         $user = $token->getUser();
         $this->userChecker->checkPreAuth($user);
+        $this->userChecker->checkPostAuth($user);
 
         $authenticatedToken = new RememberMeToken($user, $this->providerKey, $this->secret);
         $authenticatedToken->setAttributes($token->getAttributes());

src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php

@@ -16,6 +16,7 @@
 use Symfony\Component\PropertyAccess\PropertyAccessorInterface;
 use Symfony\Component\Serializer\Exception\CircularReferenceException;
 use Symfony\Component\Serializer\Exception\LogicException;
+use Symfony\Component\Serializer\Exception\RuntimeException;
 use Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactoryInterface;
 use Symfony\Component\Serializer\NameConverter\NameConverterInterface;
 
@@ -35,6 +36,10 @@ class ObjectNormalizer extends AbstractNormalizer
 
     public function __construct(ClassMetadataFactoryInterface $classMetadataFactory = null, NameConverterInterface $nameConverter = null, PropertyAccessorInterface $propertyAccessor = null)
     {
+        if (!class_exists('Symfony\Component\PropertyAccess\PropertyAccess')) {
+            throw new RuntimeException('The ObjectNormalizer class requires the "PropertyAccess" component. Install "symfony/property-access" to use it.');
+        }
+
         parent::__construct($classMetadataFactory, $nameConverter);
 
         $this->propertyAccessor = $propertyAccessor ?: PropertyAccess::createPropertyAccessor();

src/Symfony/Component/Validator/Constraints/UrlValidator.php

@@ -23,7 +23,7 @@ class UrlValidator extends ConstraintValidator
 {
     const PATTERN = '~^
             (%s)://                                 # protocol
-            (([\pL\pN-]+:)?([\pL\pN-]+)@)?          # basic auth
+            (([\.\pL\pN-]+:)?([\.\pL\pN-]+)@)?      # basic auth
             (
                 ([\pL\pN\pS-\.])+(\.?([\pL\pN]|xn\-\-[\pL\pN-]+)+\.?) # a domain name
                     |                                                 # or