浏览代码

fixed a few bugs from review

Johannes M. Schmitt 12 年之前
父节点
当前提交
0fa64a3be6

+ 3 - 10
Serializer/Construction/DoctrineObjectConstructor.php

@@ -18,27 +18,20 @@
 
 namespace JMS\SerializerBundle\Serializer\Construction;
 
-use Symfony\Bridge\Doctrine\ManagerRegistry;
+use Doctrine\Common\Persistence\ManagerRegistry;
 use JMS\SerializerBundle\Serializer\VisitorInterface;
 use JMS\SerializerBundle\Metadata\ClassMetadata;
 
 class DoctrineObjectConstructor implements ObjectConstructorInterface
 {
-    /**
-     * @var \Symfony\Bridge\Doctrine\ManagerRegistry
-     */
     private $managerRegistry;
-
-    /**
-     * @var \JMS\SerializerBundle\Serializer\Construction\ObjectConstructorInterface
-     */
     private $fallbackConstructor;
 
     /**
      * Constructor.
      *
-     * @param \Symfony\Bridge\Doctrine\ManagerRegistry                                 $managerRegistry
-     * @param \JMS\SerializerBundle\Serializer\Construction\ObjectConstructorInterface $fallbackConstructor
+     * @param ManagerRegistry            $managerRegistry
+     * @param ObjectConstructorInterface $fallbackConstructor
      */
     public function __construct(ManagerRegistry $managerRegistry, ObjectConstructorInterface $fallbackConstructor)
     {

+ 6 - 3
Serializer/Handler/ConstraintViolationHandler.php

@@ -88,7 +88,7 @@ class ConstraintViolationHandler implements SubscribingHandlerInterface
         $messageNode->appendChild($visitor->document->createCDATASection($violation->getMessage()));
     }
 
-    public function serializeViolationToJson(GenericSerializationVisitor $visitor, ConstraintViolation $violation, array $type = null)
+    public function serializeViolationToJson(JsonSerializationVisitor $visitor, ConstraintViolation $violation, array $type = null)
     {
         $data = array(
             'property_path' => $violation->getPropertyPath(),
@@ -102,8 +102,11 @@ class ConstraintViolationHandler implements SubscribingHandlerInterface
         return $data;
     }
 
-    public function serializeViolationToYml(YamlSerializationVisitor $visitor, ConstraintViolation $violaton, array $type = null)
+    public function serializeViolationToYml(YamlSerializationVisitor $visitor, ConstraintViolation $violation, array $type = null)
     {
-        return $this->serializeViolationToJson($visitor, $violation);
+        return array(
+            'property_path' => $violation->getPropertyPath(),
+            'message' => $violation->getMessage(),
+        );
     }
 }

+ 1 - 1
Serializer/Handler/DateTimeHandler.php

@@ -94,7 +94,7 @@ class DateTimeHandler implements SubscribingHandlerInterface
         $timezone = isset($type['params'][1]) ? $type['params'][1] : $this->defaultTimezone;
         $datetime = \DateTime::createFromFormat($this->getFormat($type), (string) $data, $timezone);
         if (false === $datetime) {
-            throw new RuntimeException(sprintf('Invalid datetime "%s", expected format %s.', $data, $this->format));
+            throw new RuntimeException(sprintf('Invalid datetime "%s", expected format %s.', $data, $this->defaultFormat));
         }
 
         return $datetime;

+ 3 - 1
Serializer/Handler/FormErrorHandler.php

@@ -82,7 +82,9 @@ class FormErrorHandler implements SubscribingHandlerInterface
             if (null !== $node = $this->serializeFormToXml($visitor, $child, array())) {
                 $formNode->appendChild($node);
             }
-        }
+        }
+
+        return $formNode;
     }
 
     public function serializeFormToJson(JsonSerializationVisitor $visitor, Form $form, array $type)

+ 1 - 1
Serializer/Handler/LazyHandlerRegistry.php

@@ -17,7 +17,7 @@ class LazyHandlerRegistry extends HandlerRegistry
 
     public function registerHandler($direction, $typeName, $format, $handler)
     {
-        parent::registerHandler($directon, $typeName, $format, $handler);
+        parent::registerHandler($direction, $typeName, $format, $handler);
         unset($this->initializedHandlers[$direction][$typeName][$format]);
     }
 

+ 2 - 1
Tests/Serializer/BaseSerializationTest.php

@@ -78,10 +78,11 @@ use Symfony\Component\Yaml\Inline;
 
 abstract class BaseSerializationTest extends \PHPUnit_Framework_TestCase
 {
+    protected $factory;
     protected $dispatcher;
     protected $serializer;
     protected $handlerRegistry;
-    protected $serializatonVisitors;
+    protected $serializationVisitors;
     protected $deserializationVisitors;
 
     public function testString()