Skip to content

Commit 00f4faf

Browse files
authored
Merge pull request #1 from andrejvrabec/master
Basic changes to work with newer jms/serializer 1.* version
2 parents ab8b501 + d161c88 commit 00f4faf

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"php": ">=5.3.3",
3838
"zendframework/zendframework": "2.*",
3939
"doctrine/doctrine-module": ">=0.5.1",
40-
"jms/serializer": "1.*"
40+
"jms/serializer": "~1.6"
4141
},
4242
"require-dev": {
4343
"zendframework/zend-developer-tools": "dev-master"

src/JMSSerializerModule/Module.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ public function getServiceConfig()
184184
return $vistor;
185185
},
186186
'jms_serializer.json_deserialization_visitor' => function (ServiceManager $sm) {
187-
return new JsonDeserializationVisitor($sm->get('jms_serializer.naming_strategy'), $sm->get('jms_serializer.object_constructor'));
187+
return new JsonDeserializationVisitor($sm->get('jms_serializer.naming_strategy'));
188188
},
189189
'jms_serializer.xml_serialization_visitor' => function(ServiceManager $sm) {
190190
return new XmlSerializationVisitor($sm->get('jms_serializer.naming_strategy'));
@@ -194,7 +194,7 @@ public function getServiceConfig()
194194
$options = new Visitors($options['jms_serializer']['visitors']);
195195

196196
$xmlOptions = $options->getXml();
197-
$visitor = new XmlDeserializationVisitor($sm->get('jms_serializer.naming_strategy'), $sm->get('jms_serializer.object_constructor'));
197+
$visitor = new XmlDeserializationVisitor($sm->get('jms_serializer.naming_strategy'));
198198
$visitor->setDoctypeWhitelist($xmlOptions['doctype_whitelist']);
199199

200200
return $visitor;

0 commit comments

Comments
 (0)