浏览代码

fixed some tests

Johannes Schmitt 14 年之前
父节点
当前提交
81537ff8af

+ 2 - 2
Resources/config/services.xml

@@ -12,8 +12,8 @@
         <parameter key="jms_serializer.camel_case_naming_strategy.class">JMS\SerializerBundle\Serializer\Naming\CamelCaseNamingStrategy</parameter>
         <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.serialized_name_annotation_strategy.class">JMS\SerializerBundle\Serializer\Naming\SerializedNameAnnotationStrategy</parameter>
 
 
-        <parameter key="jms_serializer.xml_encoder.class">Symfony\Component\Serializer\Encoder\XmlEncoder</parameter>
-        <parameter key="jms_serializer.json_encoder.class">Symfony\Component\Serializer\Encoder\JsonEncoder</parameter>
+        <parameter key="jms_serializer.xml_encoder.class">JMS\SerializerBundle\Serializer\Encoder\XmlEncoder</parameter>
+        <parameter key="jms_serializer.json_encoder.class">JMS\SerializerBundle\Serializer\Encoder\JsonEncoder</parameter>
 
 
         <parameter key="jms_serializer.native_php_type_normalizer.class">JMS\SerializerBundle\Serializer\Normalizer\NativePhpTypeNormalizer</parameter>
         <parameter key="jms_serializer.native_php_type_normalizer.class">JMS\SerializerBundle\Serializer\Normalizer\NativePhpTypeNormalizer</parameter>
         <parameter key="jms_serializer.property_based_normalizer.class">JMS\SerializerBundle\Serializer\Normalizer\PropertyBasedNormalizer</parameter>
         <parameter key="jms_serializer.property_based_normalizer.class">JMS\SerializerBundle\Serializer\Normalizer\PropertyBasedNormalizer</parameter>

+ 5 - 5
Serializer/Normalizer/PropertyBasedNormalizer.php

@@ -64,9 +64,9 @@ class PropertyBasedNormalizer extends SerializerAwareNormalizer
         $normalized = array();
         $normalized = array();
         $metadata = $this->metadataFactory->getMetadataForClass(get_class($object));
         $metadata = $this->metadataFactory->getMetadataForClass(get_class($object));
 
 
-        foreach ($metadata->classes as $classMetadata) {
+        foreach ($metadata->classMetadata as $classMetadata) {
             $exclusionStrategy = $this->exclusionStrategyFactory->getStrategy($classMetadata->exclusionPolicy);
             $exclusionStrategy = $this->exclusionStrategyFactory->getStrategy($classMetadata->exclusionPolicy);
-            foreach ($classMetadata->properties as $propertyMetadata) {
+            foreach ($classMetadata->propertyMetadata as $propertyMetadata) {
                 if ($exclusionStrategy->shouldSkipProperty($propertyMetadata)) {
                 if ($exclusionStrategy->shouldSkipProperty($propertyMetadata)) {
                     continue;
                     continue;
                 }
                 }
@@ -95,12 +95,12 @@ class PropertyBasedNormalizer extends SerializerAwareNormalizer
         }
         }
 
 
         $metadata = $this->metadataFactory->getMetadataForClass($type);
         $metadata = $this->metadataFactory->getMetadataForClass($type);
-        $object = $this->instanceCreator->createInstance(end($metadata->classes)->reflection);
+        $object = $this->instanceCreator->createInstance(end($metadata->classMetadata)->reflection);
 
 
-        foreach ($metadata->classes as $classMetadata) {
+        foreach ($metadata->classMetadata as $classMetadata) {
             $exclusionStrategy = $this->exclusionStrategyFactory->getStrategy($classMetadata->exclusionPolicy);
             $exclusionStrategy = $this->exclusionStrategyFactory->getStrategy($classMetadata->exclusionPolicy);
 
 
-            foreach ($classMetadata->properties as $propertyMetadata) {
+            foreach ($classMetadata->propertyMetadata as $propertyMetadata) {
                 if ($exclusionStrategy->shouldSkipProperty($propertyMetadata)) {
                 if ($exclusionStrategy->shouldSkipProperty($propertyMetadata)) {
                     continue;
                     continue;
                 }
                 }

+ 1 - 3
Tests/Serializer/Normalizer/PropertyBasedNormalizerTest.php

@@ -3,11 +3,9 @@
 namespace JMS\SerializerBundle\Tests\Serializer\Normalizer;
 namespace JMS\SerializerBundle\Tests\Serializer\Normalizer;
 
 
 use JMS\SerializerBundle\Serializer\Normalizer\NativePhpTypeNormalizer;
 use JMS\SerializerBundle\Serializer\Normalizer\NativePhpTypeNormalizer;
-
 use JMS\SerializerBundle\Serializer\Serializer;
 use JMS\SerializerBundle\Serializer\Serializer;
-
 use JMS\SerializerBundle\Serializer\UnserializeInstanceCreator;
 use JMS\SerializerBundle\Serializer\UnserializeInstanceCreator;
-use JMS\SerializerBundle\Metadata\MetadataFactory;
+use Metadata\MetadataFactory;
 use JMS\SerializerBundle\Metadata\Driver\AnnotationDriver;
 use JMS\SerializerBundle\Metadata\Driver\AnnotationDriver;
 use Annotations\Reader;
 use Annotations\Reader;
 use JMS\SerializerBundle\Tests\Fixtures\AllExcludedObject;
 use JMS\SerializerBundle\Tests\Fixtures\AllExcludedObject;