Skip to content
This repository was archived by the owner on Jan 29, 2020. It is now read-only.

fixed #95: don't try to unserialize missing items #96

Merged
merged 1 commit into from
Apr 16, 2016
Merged

fixed #95: don't try to unserialize missing items #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions src/Storage/Plugin/Serializer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,12 @@ public function attach(EventManagerInterface $events, $priority = 1)
*/
public function onReadItemPost(PostEvent $event)
{
$serializer = $this->getOptions()->getSerializer();
$result = $event->getResult();
$result = $serializer->unserialize($result);
$event->setResult($result);
$result = $event->getResult();
if ($result !== null) {
$serializer = $this->getOptions()->getSerializer();
$result = $serializer->unserialize($result);
$event->setResult($result);
}
}

/**
Expand Down
32 changes: 25 additions & 7 deletions test/Storage/Plugin/SerializerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,25 +97,43 @@ public function testRemovePlugin()

public function testUnserializeOnReadItem()
{
$args = new ArrayObject([
'key' => 'test',
'success' => true,
'casToken' => null,
]);
$value = serialize(123);
$event = new PostEvent('getItem.post', $this->_adapter, new ArrayObject(), $value);
$event = new PostEvent('getItem.post', $this->_adapter, $args, $value);
$this->_plugin->onReadItemPost($event);

$this->assertFalse($event->propagationIsStopped());
$this->assertSame(123, $event->getResult());
$this->assertFalse($event->propagationIsStopped(), 'Event propagation has been stopped');
$this->assertSame(123, $event->getResult(), 'Result was not unserialized');
}

public function testDontUnserializeOnReadMissingItem()
{
$args = new ArrayObject(['key' => 'test']);
$value = null;
$event = new PostEvent('getItem.post', $this->_adapter, $args, $value);
$this->_plugin->onReadItemPost($event);

$this->assertFalse($event->propagationIsStopped(), 'Event propagation has been stopped');
$this->assertSame($value, $event->getResult(), 'Missing item was unserialized');
}

public function testUnserializeOnReadItems()
{
$values = ['key1' => serialize(123), 'key2' => serialize(456)];
$event = new PostEvent('getItems.post', $this->_adapter, new ArrayObject(), $values);
$args = new ArrayObject(['keys' => array_keys($values) + ['missing']]);
$event = new PostEvent('getItems.post', $this->_adapter, $args, $values);

$this->_plugin->onReadItemsPost($event);

$this->assertFalse($event->propagationIsStopped());
$this->assertFalse($event->propagationIsStopped(), 'Event propagation has been stopped');

$values = $event->getResult();
$this->assertSame(123, $values['key1']);
$this->assertSame(456, $values['key2']);
$this->assertSame(123, $values['key1'], "Item 'key1' was not unserialized");
$this->assertSame(456, $values['key2'], "Item 'key2' was not unserialized");
$this->assertArrayNotHasKey('missing', $values, 'Missing item should not be present in the result');
}
}