Merge branch '3.4' into 4.2

* 3.4:
  [DI] Fix dumping Doctrine-like service graphs
  fix serialization workaround in CustomUserMessageAuthenticationException
  PHPUnit Bridge: Rollback to traditional array syntax.
  [Form] fix some docblocks and type checks

Author: nicolas-grekas

Core/Exception/CustomUserMessageAuthenticationException.php

@@ -60,7 +60,7 @@ public function getMessageData()
      */
     public function serialize()
     {
-        return serialize([parent::serialize(true), $this->messageKey, $this->messageData]);
+        $serialized = [parent::serialize(true), $this->messageKey, $this->messageData];
 
         return $this->doSerialize($serialized, \func_num_args() ? \func_get_arg(0) : null);
     }

Core/Tests/Exception/CustomUserMessageAuthenticationExceptionTest.php

@@ -15,6 +15,21 @@
 use Symfony\Component\Security\Core\Authentication\Token\AnonymousToken;
 use Symfony\Component\Security\Core\Exception\CustomUserMessageAuthenticationException;
 
+class ChildCustomUserMessageAuthenticationException extends CustomUserMessageAuthenticationException
+{
+    public function serialize()
+    {
+        return serialize([$this->childMember, parent::serialize()]);
+    }
+
+    public function unserialize($str)
+    {
+        list($this->childMember, $parentData) = unserialize($str);
+
+        parent::unserialize($parentData);
+    }
+}
+
 class CustomUserMessageAuthenticationExceptionTest extends TestCase
 {
     public function testConstructWithSAfeMessage()
@@ -39,4 +54,18 @@ public function testSharedSerializedData()
         $this->assertEquals($token, $processed->getMessageData()['token']);
         $this->assertSame($processed->getToken(), $processed->getMessageData()['token']);
     }
+
+    public function testSharedSerializedDataFromChild()
+    {
+        $token = new AnonymousToken('foo', 'bar');
+
+        $exception = new ChildCustomUserMessageAuthenticationException();
+        $exception->childMember = $token;
+        $exception->setToken($token);
+
+        $processed = unserialize(serialize($exception));
+        $this->assertEquals($token, $processed->childMember);
+        $this->assertEquals($token, $processed->getToken());
+        $this->assertSame($processed->getToken(), $processed->childMember);
+    }
 }