Merge branch '2.7' into 2.8

* 2.7:
  removed @covers annotations in tests
  removed all @covers annotations
  [PropertyAccess] Major performance improvement

2 files changed, 0 insertions, 52 deletions

diff --git a/Core/Tests/Authentication/Token/AbstractTokenTest.php b/Core/Tests/Authentication/Token/AbstractTokenTest.php
index 6f2b6ed..1a786d7 100644
--- a/Core/Tests/Authentication/Token/AbstractTokenTest.php
+++ b/Core/Tests/Authentication/Token/AbstractTokenTest.php
@@ -85,10 +85,6 @@ class AbstractTokenTest extends \PHPUnit_Framework_TestCase
         $token->eraseCredentials();
     }
 
-    /**
-     * @covers Symfony\Component\Security\Core\Authentication\Token\AbstractToken::serialize
-     * @covers Symfony\Component\Security\Core\Authentication\Token\AbstractToken::unserialize
-     */
     public function testSerialize()
     {
         $token = $this->getToken(array('ROLE_FOO'));
@@ -114,9 +110,6 @@ class AbstractTokenTest extends \PHPUnit_Framework_TestCase
         );
     }
 
-    /**
-     * @covers Symfony\Component\Security\Core\Authentication\Token\AbstractToken::__construct
-     */
     public function testConstructor()
     {
         $token = $this->getToken(array('ROLE_FOO'));
@@ -129,10 +122,6 @@ class AbstractTokenTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals(array(new Role('ROLE_FOO'), new Role('ROLE_BAR')), $token->getRoles());
     }
 
-    /**
-     * @covers Symfony\Component\Security\Core\Authentication\Token\AbstractToken::isAuthenticated
-     * @covers Symfony\Component\Security\Core\Authentication\Token\AbstractToken::setAuthenticated
-     */
     public function testAuthenticatedFlag()
     {
         $token = $this->getToken();
@@ -145,13 +134,6 @@ class AbstractTokenTest extends \PHPUnit_Framework_TestCase
         $this->assertFalse($token->isAuthenticated());
     }
 
-    /**
-     * @covers Symfony\Component\Security\Core\Authentication\Token\AbstractToken::getAttributes
-     * @covers Symfony\Component\Security\Core\Authentication\Token\AbstractToken::setAttributes
-     * @covers Symfony\Component\Security\Core\Authentication\Token\AbstractToken::hasAttribute
-     * @covers Symfony\Component\Security\Core\Authentication\Token\AbstractToken::getAttribute
-     * @covers Symfony\Component\Security\Core\Authentication\Token\AbstractToken::setAttribute
-     */
     public function testAttributes()
     {
         $attributes = array('foo' => 'bar');
diff --git a/Core/Tests/User/UserTest.php b/Core/Tests/User/UserTest.php
index f514eda..b589b4a 100644
--- a/Core/Tests/User/UserTest.php
+++ b/Core/Tests/User/UserTest.php
@@ -16,7 +16,6 @@ use Symfony\Component\Security\Core\User\User;
 class UserTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @covers Symfony\Component\Security\Core\User\User::__construct
      * @expectedException \InvalidArgumentException
      */
     public function testConstructorException()
@@ -24,10 +23,6 @@ class UserTest extends \PHPUnit_Framework_TestCase
         new User('', 'superpass');
     }
 
-    /**
-     * @covers Symfony\Component\Security\Core\User\User::__construct
-     * @covers Symfony\Component\Security\Core\User\User::getRoles
-     */
     public function testGetRoles()
     {
         $user = new User('fabien', 'superpass');
@@ -37,38 +32,24 @@ class UserTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals(array('ROLE_ADMIN'), $user->getRoles());
     }
 
-    /**
-     * @covers Symfony\Component\Security\Core\User\User::__construct
-     * @covers Symfony\Component\Security\Core\User\User::getPassword
-     */
     public function testGetPassword()
     {
         $user = new User('fabien', 'superpass');
         $this->assertEquals('superpass', $user->getPassword());
     }
 
-    /**
-     * @covers Symfony\Component\Security\Core\User\User::__construct
-     * @covers Symfony\Component\Security\Core\User\User::getUsername
-     */
     public function testGetUsername()
     {
         $user = new User('fabien', 'superpass');
         $this->assertEquals('fabien', $user->getUsername());
     }
 
-    /**
-     * @covers Symfony\Component\Security\Core\User\User::getSalt
-     */
     public function testGetSalt()
     {
         $user = new User('fabien', 'superpass');
         $this->assertEquals('', $user->getSalt());
     }
 
-    /**
-     * @covers Symfony\Component\Security\Core\User\User::isAccountNonExpired
-     */
     public function testIsAccountNonExpired()
     {
         $user = new User('fabien', 'superpass');
@@ -78,9 +59,6 @@ class UserTest extends \PHPUnit_Framework_TestCase
         $this->assertFalse($user->isAccountNonExpired());
     }
 
-    /**
-     * @covers Symfony\Component\Security\Core\User\User::isCredentialsNonExpired
-     */
     public function testIsCredentialsNonExpired()
     {
         $user = new User('fabien', 'superpass');
@@ -90,9 +68,6 @@ class UserTest extends \PHPUnit_Framework_TestCase
         $this->assertFalse($user->isCredentialsNonExpired());
     }
 
-    /**
-     * @covers Symfony\Component\Security\Core\User\User::isAccountNonLocked
-     */
     public function testIsAccountNonLocked()
     {
         $user = new User('fabien', 'superpass');
@@ -102,9 +77,6 @@ class UserTest extends \PHPUnit_Framework_TestCase
         $this->assertFalse($user->isAccountNonLocked());
     }
 
-    /**
-     * @covers Symfony\Component\Security\Core\User\User::isEnabled
-     */
     public function testIsEnabled()
     {
         $user = new User('fabien', 'superpass');
@@ -114,9 +86,6 @@ class UserTest extends \PHPUnit_Framework_TestCase
         $this->assertFalse($user->isEnabled());
     }
 
-    /**
-     * @covers Symfony\Component\Security\Core\User\User::eraseCredentials
-     */
     public function testEraseCredentials()
     {
         $user = new User('fabien', 'superpass');
@@ -124,9 +93,6 @@ class UserTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals('superpass', $user->getPassword());
     }
 
-    /**
-     * @covers Symfony\Component\Security\Core\User\User::__toString
-     */
     public function testToString()
     {
         $user = new User('fabien', 'superpass');