Merge branch '2.2' into 2.3

* 2.2:
  Fix some annotates
  [FrameworkBundle] made sure that the debug event dispatcher is used everywhere
  [HttpKernel] remove unneeded strtoupper
  updated the composer install command to reflect changes in Composer

Conflicts:
	src/Symfony/Component/Console/Application.php
	src/Symfony/Component/Console/Command/Command.php
	src/Symfony/Component/Console/Input/InputDefinition.php
	src/Symfony/Component/CssSelector/Node/CombinedSelectorNode.php
	src/Symfony/Component/Form/Form.php
	src/Symfony/Component/HttpKernel/Debug/ErrorHandler.php
	src/Symfony/Component/HttpKernel/DependencyInjection/RegisterListenersPass.php
	src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterListenersPassTest.php
	src/Symfony/Component/Locale/Locale.php
	src/Symfony/Component/Locale/README.md
	src/Symfony/Component/Locale/Stub/DateFormat/FullTransformer.php

Author: fabpot

Authentication/RememberMe/TokenProviderInterface.php

@@ -23,11 +23,11 @@ interface TokenProviderInterface
     /**
      * Loads the active token for the given series.
      *
-     * @throws TokenNotFoundException if the token is not found
-     *
      * @param string $series
      *
      * @return PersistentTokenInterface
+     *
+     * @throws TokenNotFoundException if the token is not found
      */
     public function loadTokenBySeries($series);
 
@@ -44,6 +44,7 @@ public function deleteTokenBySeries($series);
      * @param string    $series
      * @param string    $tokenValue
      * @param \DateTime $lastUsed
+     * @throws TokenNotFoundException if the token is not found
      */
     public function updateToken($series, $tokenValue, \DateTime $lastUsed);
 

Authentication/Token/AbstractToken.php

@@ -91,7 +91,7 @@ public function getUser()
     public function setUser($user)
     {
         if (!($user instanceof UserInterface || (is_object($user) && method_exists($user, '__toString')) || is_string($user))) {
-            throw new \InvalidArgumentException('$user must be an instanceof of UserInterface, an object implementing a __toString method, or a primitive string.');
+            throw new \InvalidArgumentException('$user must be an instanceof UserInterface, an object implementing a __toString method, or a primitive string.');
         }
 
         if (null === $this->user) {
@@ -190,7 +190,7 @@ public function hasAttribute($name)
     }
 
     /**
-     * Returns a attribute value.
+     * Returns an attribute value.
      *
      * @param string $name The attribute name
      *

Encoder/BCryptPasswordEncoder.php

@@ -12,137 +12,72 @@
 namespace Symfony\Component\Security\Core\Encoder;
 
 use Symfony\Component\Security\Core\Encoder\BasePasswordEncoder;
-use Symfony\Component\Security\Core\Util\SecureRandomInterface;
 
 /**
  * @author Elnur Abdurrakhimov <[email protected]>
  * @author Terje Bråten <[email protected]>
  */
 class BCryptPasswordEncoder extends BasePasswordEncoder
 {
-    /**
-     * @var SecureRandomInterface
-     */
-    private $secureRandom;
-
     /**
      * @var string
      */
     private $cost;
 
-    private static $prefix = null;
-
     /**
      * Constructor.
      *
-     * @param SecureRandomInterface $secureRandom A SecureRandomInterface instance
-     * @param integer               $cost         The algorithmic cost that should be used
+     * @param integer $cost The algorithmic cost that should be used
      *
      * @throws \InvalidArgumentException if cost is out of range
      */
-    public function __construct(SecureRandomInterface $secureRandom, $cost)
+    public function __construct($cost)
     {
-        $this->secureRandom = $secureRandom;
+        if (!function_exists('password_hash')) {
+            throw new \RuntimeException('To use the BCrypt encoder, you need to upgrade to PHP 5.5 or install the "ircmaxell/password-compat" via Composer.');
+        }
 
         $cost = (int) $cost;
         if ($cost < 4 || $cost > 31) {
             throw new \InvalidArgumentException('Cost must be in the range of 4-31.');
         }
-        $this->cost = sprintf('%02d', $cost);
-
-        if (!self::$prefix) {
-            self::$prefix = '$'.(version_compare(phpversion(), '5.3.7', '>=') ? '2y' : '2a').'$';
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function encodePassword($raw, $salt)
-    {
-        if (function_exists('password_hash')) {
-            return password_hash($raw, PASSWORD_BCRYPT, array('cost' => $this->cost));
-        }
-
-        $salt = self::$prefix.$this->cost.'$'.$this->encodeSalt($this->getRawSalt());
-        $encoded = crypt($raw, $salt);
-        if (!is_string($encoded) || strlen($encoded) <= 13) {
-            return false;
-        }
-
-        return $encoded;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function isPasswordValid($encoded, $raw, $salt)
-    {
-        if (function_exists('password_verify')) {
-            return password_verify($raw, $encoded);
-        }
 
-        $crypted = crypt($raw, $encoded);
-        if (strlen($crypted) <= 13) {
-            return false;
-        }
-
-        return $this->comparePasswords($encoded, $crypted);
+        $this->cost = sprintf('%02d', $cost);
     }
 
     /**
-     * Encodes the salt to be used by Bcrypt.
+     * Encodes the raw password.
      *
-     * The blowfish/bcrypt algorithm used by PHP crypt expects a different
-     * set and order of characters than the usual base64_encode function.
-     * Regular b64: ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/
-     * Bcrypt b64:  ./ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789
-     * We care because the last character in our encoded string will
-     * only represent 2 bits.  While two known implementations of
-     * bcrypt will happily accept and correct a salt string which
-     * has the 4 unused bits set to non-zero, we do not want to take
-     * chances and we also do not want to waste an additional byte
-     * of entropy.
+     * It doesn't work with PHP versions lower than 5.3.7, since
+     * the password compat library uses CRYPT_BLOWFISH hash type with
+     * the "$2y$" salt prefix (which is not available in the early PHP versions).
+     * @see https://github.com/ircmaxell/password_compat/issues/10#issuecomment-11203833
      *
-     * @param  bytes  $random a string of 16 random bytes
+     * It is almost best to **not** pass a salt and let PHP generate one for you.
      *
-     * @return string Properly encoded salt to use with php crypt function
+     * @param string $raw  The password to encode
+     * @param string $salt The salt
      *
-     * @throws \InvalidArgumentException if string of random bytes is too short
+     * @return string The encoded password
+     *
+     * @link http://lxr.php.net/xref/PHP_5_5/ext/standard/password.c#111
      */
-    protected function encodeSalt($random)
+    public function encodePassword($raw, $salt)
     {
-        $len = strlen($random);
-        if ($len < 16) {
-            throw new \InvalidArgumentException('The bcrypt salt needs 16 random bytes.');
-        }
-        if ($len > 16) {
-            $random = substr($random, 0, 16);
-        }
+        $options = array('cost' => $this->cost);
 
-        $base64raw = str_replace('+', '.', base64_encode($random));
-        $salt128bit = substr($base64raw, 0, 21);
-        $lastchar = substr($base64raw, 21, 1);
-        $lastchar = strtr($lastchar, 'AQgw', '.Oeu');
-        $salt128bit .= $lastchar;
+        if ($salt) {
+            $options['salt'] = $salt;
+        }
 
-        return $salt128bit;
+        return password_hash($raw, PASSWORD_BCRYPT, $options);
     }
 
     /**
-     * @return bytes 16 random bytes to be used in the salt
+     * {@inheritdoc}
      */
-    protected function getRawSalt()
+    public function isPasswordValid($encoded, $raw, $salt)
     {
-        $rawSalt = false;
-        $numBytes = 16;
-        if (function_exists('mcrypt_create_iv')) {
-            $rawSalt = mcrypt_create_iv($numBytes, MCRYPT_DEV_URANDOM);
-        }
-        if (!$rawSalt) {
-            $rawSalt = $this->secureRandom->nextBytes($numBytes);
-        }
-
-        return $rawSalt;
+        return password_verify($raw, $encoded);
     }
 }

Encoder/Pbkdf2PasswordEncoder.php

@@ -82,7 +82,7 @@ private function hashPbkdf2($algorithm, $password, $salt, $iterations, $length =
         $digest = '';
 
         for ($i = 1; $i <= $blocks; $i++) {
-            $ib = $block = hash_hmac($algorithm, $salt . pack('N', $i), $password, true);
+            $ib = $block = hash_hmac($algorithm, $salt.pack('N', $i), $password, true);
 
             // Iterations
             for ($j = 1; $j < $iterations; $j++) {

User/ChainUserProvider.php

@@ -31,6 +31,14 @@ public function __construct(array $providers)
         $this->providers = $providers;
     }
 
+    /**
+     * @return array
+     */
+    public function getProviders()
+    {
+        return $this->providers;
+    }
+
     /**
      * {@inheritDoc}
      */