Fix multiple handler callbacks in YamlDriver

src/JMS/Serializer/Metadata/Driver/YamlDriver.php

@@ -203,9 +203,9 @@ protected function loadMetadataFromFile(\ReflectionClass $class, $file)
         }
 
         if (isset($config['handler_callbacks'])) {
-            foreach ($config['handler_callbacks'] as $direction => $formats) {
+            foreach ($config['handler_callbacks'] as $directionName => $formats) {
+                $direction = GraphNavigator::parseDirection($directionName);
                 foreach ($formats as $format => $methodName) {
-                    $direction = GraphNavigator::parseDirection($direction);
                     $metadata->addHandlerCallback($direction, $format, $methodName);
                 }
             }

tests/JMS/Serializer/Tests/Fixtures/ObjectWithHandlerCallbacks.php

@@ -0,0 +1,46 @@
+<?php
+
+/*
+ * Copyright 2013 Johannes M. Schmitt <[email protected]>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace JMS\Serializer\Tests\Fixtures;
+
+use JMS\Serializer\Annotation\HandlerCallback;
+use JMS\Serializer\Annotation\Type;
+
+class ObjectWithHandlerCallbacks
+{
+    /**
+     * @Type("string")
+     */
+    public $name;
+
+    /**
+     * @HandlerCallback(direction="serialization", format="json")
+     */
+    public function toJson()
+    {
+        return $this->name;
+    }
+
+    /**
+     * @HandlerCallback(direction="serialization", format="xml")
+     */
+    public function toXml()
+    {
+        return $this->name;
+    }
+}

tests/JMS/Serializer/Tests/Metadata/Driver/BaseDriverTest.php

@@ -18,6 +18,7 @@
 
 namespace JMS\Serializer\Tests\Metadata\Driver;
 
+use JMS\Serializer\GraphNavigator;
 use JMS\Serializer\Metadata\ClassMetadata;
 use JMS\Serializer\Metadata\PropertyMetadata;
 use JMS\Serializer\Metadata\VirtualPropertyMetadata;
@@ -321,6 +322,13 @@ public function testXmlNamespaceInheritanceMetadata()
         $this->assertEquals($p, $m->propertyMetadata['qux']);
     }
 
+    public function testHandlerCallbacks()
+    {
+        $m = $this->getDriver()->loadMetadataForClass(new \ReflectionClass('JMS\Serializer\Tests\Fixtures\ObjectWithHandlerCallbacks'));
+
+        $this->assertEquals('toJson', $m->handlerCallbacks[GraphNavigator::DIRECTION_SERIALIZATION]['json']);
+        $this->assertEquals('toXml', $m->handlerCallbacks[GraphNavigator::DIRECTION_SERIALIZATION]['xml']);
+    }
 
     /**
      * @return DriverInterface

tests/JMS/Serializer/Tests/Metadata/Driver/php/ObjectWithHandlerCallbacks.php

@@ -0,0 +1,16 @@
+<?php
+
+use JMS\Serializer\GraphNavigator;
+use JMS\Serializer\Metadata\ClassMetadata;
+use JMS\Serializer\Metadata\PropertyMetadata;
+
+$metadata = new ClassMetadata('JMS\Serializer\Tests\Fixtures\ObjectWithHandlerCallbacks');
+
+$pMetadata = new PropertyMetadata('JMS\Serializer\Tests\Fixtures\ObjectWithHandlerCallbacks', 'name');
+$pMetadata->type = 'string';
+$metadata->addPropertyMetadata($pMetadata);
+
+$metadata->addHandlerCallback(GraphNavigator::DIRECTION_SERIALIZATION, 'json', 'toJson');
+$metadata->addHandlerCallback(GraphNavigator::DIRECTION_SERIALIZATION, 'xml', 'toXml');
+
+return $metadata;

tests/JMS/Serializer/Tests/Metadata/Driver/xml/ObjectWithHandlerCallbacks.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<serializer>
+    <class name="JMS\Serializer\Tests\Fixtures\ObjectWithHandlerCallbacks">
+        <property name="name" type="string"/>
+        <callback-method name="toJson" type="handler" direction="serialization" format="json" />
+        <callback-method name="toXml" type="handler" direction="serialization" format="xml" />
+    </class>
+</serializer>

tests/JMS/Serializer/Tests/Metadata/Driver/yml/ObjectWithHandlerCallbacks.yml

@@ -0,0 +1,8 @@
+JMS\Serializer\Tests\Fixtures\ObjectWithHandlerCallbacks:
+    properties:
+        name:
+            type: string
+    handler_callbacks:
+        serialization:
+            xml: toXml
+            json: toJson