Revert "merged branch stof/serializable_role (PR #4925)"

This reverts commit b0750f6dcd, reversing
changes made to d09bfe7552.
This commit is contained in:
Fabien Potencier 2012-07-15 14:58:33 +02:00
parent 2644f1c2f5
commit 93cbdfdd62
3 changed files with 1 additions and 36 deletions

View File

@ -4,7 +4,6 @@ CHANGELOG
2.1.0
-----
* Added the Serializable interface on the Role class
* [BC BREAK] The signature of ExceptionListener has changed
* changed the HttpUtils constructor signature to take a UrlGenerator and a UrlMatcher instead of a Router
* EncoderFactoryInterface::getEncoder() can now also take a class name as an argument

View File

@ -17,7 +17,7 @@ namespace Symfony\Component\Security\Core\Role;
*
* @author Fabien Potencier <fabien@symfony.com>
*/
class Role implements RoleInterface, \Serializable
class Role implements RoleInterface
{
private $role;
@ -38,20 +38,4 @@ class Role implements RoleInterface, \Serializable
{
return $this->role;
}
/**
* {@inheritdoc}
*/
public function serialize()
{
return serialize($this->role);
}
/**
* {@inheritdoc}
*/
public function unserialize($serialized)
{
$this->role = unserialize($serialized);
}
}

View File

@ -45,22 +45,4 @@ class SwitchUserRole extends Role
{
return $this->source;
}
/**
* {@inheritdoc}
*/
public function serialize()
{
return serialize(array(parent::serialize(), $this->source));
}
/**
* {@inheritdoc}
*/
public function unserialize($serialized)
{
list($parent, $this->source) = unserialize($serialized);
parent::unserialize($parent);
}
}