Merge pull request #793 from kriswallsmith/master

do not disappear type params in DoctrineProxySubscriber
schmittjoh · Jul 4, 2017 · 22b5927 · 22b5927
2 parents 3617f8d + 8736409
commit 22b5927
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/EventDispatcher/Subscriber/DoctrineProxySubscriber.php b/src/EventDispatcher/Subscriber/DoctrineProxySubscriber.php
@@ -84,7 +84,7 @@ public function onPreSerialize(PreSerializeEvent $event)
         $object->__load();
 
         if (!$virtualType) {
-            $event->setType(get_parent_class($object));
+            $event->setType(get_parent_class($object), $type['params']);
         }
     }
 

diff --git a/tests/Serializer/EventDispatcher/Subscriber/DoctrineProxySubscriberTest.php b/tests/Serializer/EventDispatcher/Subscriber/DoctrineProxySubscriberTest.php
@@ -130,6 +130,17 @@ public function testListenersDoNotChangeTypeOnProxiesAndVirtualTypes()
         $this->assertSame(['name' => 'foo', 'params' => []], $event->getType());
     }
 
+    public function testOnPreSerializeMaintainsParams()
+    {
+        $object = new SimpleObjectProxy('foo', 'bar');
+        $type = ['name' => SimpleObjectProxy::class, 'params' => ['baz']];
+
+        $event = $this->createEvent($object, $type);
+        $this->subscriber->onPreSerialize($event);
+
+        $this->assertSame(['name' => SimpleObject::class, 'params' => ['baz']], $event->getType());
+    }
+
     protected function setUp()
     {
         $this->subscriber = new DoctrineProxySubscriber();