Merge branch '2.7'

* 2.7:
  fixed deprecation notice
  removed usage of the deprecated forms of asset() in the core framework
  renamed asset_path() to asset() and added a BC layer
  [Asset] added a NullContext class
  [Asset] added the component
  Added new Forwarded header support for Request::getClientIps
  Optimize EntityType by only loading choices for values in the same way that EntityLoader customization does (if you provide a query_builder).
  [Security] added string representation for core Users
  Add Twig loader priority

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/composer.json
	src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml

2 files changed, 14 insertions, 0 deletions

diff --git a/Core/Tests/User/UserTest.php b/Core/Tests/User/UserTest.php
index 2fe6daa..f514eda 100644
--- a/Core/Tests/User/UserTest.php
+++ b/Core/Tests/User/UserTest.php
@@ -123,4 +123,13 @@ class UserTest extends \PHPUnit_Framework_TestCase
         $user->eraseCredentials();
         $this->assertEquals('superpass', $user->getPassword());
     }
+
+    /**
+     * @covers Symfony\Component\Security\Core\User\User::__toString
+     */
+    public function testToString()
+    {
+        $user = new User('fabien', 'superpass');
+        $this->assertEquals('fabien', (string) $user);
+    }
 }
diff --git a/Core/User/User.php b/Core/User/User.php
index ea2c6a4..d458b72 100644
--- a/Core/User/User.php
+++ b/Core/User/User.php
@@ -43,6 +43,11 @@ final class User implements AdvancedUserInterface
         $this->roles = $roles;
     }
 
+    public function __toString()
+    {
+        return $this->getUsername();
+    }
+
     /**
      * {@inheritdoc}
      */