Merge branch 'fixes' of https://github.com/yethee/JMSSerializerBundle

Resources/config/services.xml

@@ -19,7 +19,7 @@
         <parameter key="jms_serializer.camel_case_naming_strategy.class">JMS\SerializerBundle\Serializer\Naming\CamelCaseNamingStrategy</parameter>
         <parameter key="jms_serializer.serialized_name_annotation_strategy.class">JMS\SerializerBundle\Serializer\Naming\SerializedNameAnnotationStrategy</parameter>
 
-        <parameter key="jms_serializer.unserialize_object_constructor.class">JMS\SerializerBundle\Serializer\UnserializeInstanceCreator</parameter>
+        <parameter key="jms_serializer.unserialize_object_constructor.class">JMS\SerializerBundle\Serializer\Construction\UnserializeObjectConstructor</parameter>
 
         <parameter key="jms_serializer.version_exclusion_strategy.class">JMS\SerializerBundle\Serializer\Exclusion\VersionExclusionStrategy</parameter>
 

Serializer/Serializer.php

@@ -18,14 +18,11 @@
 
 namespace JMS\SerializerBundle\Serializer;
 
+use Metadata\MetadataFactoryInterface;
 use JMS\SerializerBundle\Exception\InvalidArgumentException;
 use JMS\SerializerBundle\Serializer\Exclusion\VersionExclusionStrategy;
 use JMS\SerializerBundle\Serializer\Exclusion\ExclusionStrategyInterface;
-use Metadata\MetadataFactoryInterface;
-use JMS\SerializerBundle\Serializer\Normalizer\NormalizableInterface;
 use JMS\SerializerBundle\Exception\RuntimeException;
-use JMS\SerializerBundle\Serializer\SerializerAwareInterface;
-use JMS\SerializerBundle\Serializer\Normalizer\NormalizerInterface;
 
 class Serializer implements SerializerInterface
 {