From b55930a45bf0f19947ff44d6d36eae0c418ad27f Mon Sep 17 00:00:00 2001
From: Christophe Coevoet <stof@notk.org>
Date: Sat, 14 Jul 2012 17:42:15 +0200
Subject: [PATCH 1/2] [Security] Implemented the Serializable interface in the
 Role class

---
 src/Symfony/Component/Security/CHANGELOG.md    |  1 +
 .../Component/Security/Core/Role/Role.php      | 18 +++++++++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Security/CHANGELOG.md b/src/Symfony/Component/Security/CHANGELOG.md
index 797462b4e8..8c98be19f6 100644
--- a/src/Symfony/Component/Security/CHANGELOG.md
+++ b/src/Symfony/Component/Security/CHANGELOG.md
@@ -4,6 +4,7 @@ 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
diff --git a/src/Symfony/Component/Security/Core/Role/Role.php b/src/Symfony/Component/Security/Core/Role/Role.php
index 5b50981fe1..7f16302b64 100644
--- a/src/Symfony/Component/Security/Core/Role/Role.php
+++ b/src/Symfony/Component/Security/Core/Role/Role.php
@@ -17,7 +17,7 @@ namespace Symfony\Component\Security\Core\Role;
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
-class Role implements RoleInterface
+class Role implements RoleInterface, \Serializable
 {
     private $role;
 
@@ -38,4 +38,20 @@ class Role implements RoleInterface
     {
         return $this->role;
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function serialize()
+    {
+        return serialize($this->role);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function unserialize($serialized)
+    {
+        $this->role = unserialize($serialized);
+    }
 }

From 1f2f866fff08864eb595dc8c7e7b82d485c18812 Mon Sep 17 00:00:00 2001
From: Christophe Coevoet <stof@notk.org>
Date: Sat, 14 Jul 2012 18:00:37 +0200
Subject: [PATCH 2/2] fixed the serialization of the SwitchUserRole

---
 .../Security/Core/Role/SwitchUserRole.php      | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/Symfony/Component/Security/Core/Role/SwitchUserRole.php b/src/Symfony/Component/Security/Core/Role/SwitchUserRole.php
index c6795841be..3076f34e51 100644
--- a/src/Symfony/Component/Security/Core/Role/SwitchUserRole.php
+++ b/src/Symfony/Component/Security/Core/Role/SwitchUserRole.php
@@ -45,4 +45,22 @@ 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);
+    }
 }