Fix warning array_key_exists in deserialization.

src/JMS/Serializer/GenericDeserializationVisitor.php

@@ -162,7 +162,15 @@ public function visitProperty(PropertyMetadata $metadata, $data, Context $contex
     {
         $name = $this->namingStrategy->translateName($metadata);
 
-        if (null === $data || ! array_key_exists($name, $data)) {
+        if (null === $data) {
+            return;
+        }
+
+        if ( ! is_array($data)) {
+            throw new RuntimeException(sprintf('Invalid data "%s"(%s), expected "%s".', $data, $metadata->type['name'], $metadata->reflection->class));
+        }
+
+        if ( ! array_key_exists($name, $data)) {
             return;
         }
 

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

@@ -0,0 +1,53 @@
+<?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\Type;
+
+
+class ObjectWithObjectProperty
+{
+    /**
+     * @Type("string")
+     */
+    private $foo;
+
+    /**
+     * @Type("JMS\Serializer\Tests\Fixtures\Author")
+     */
+    private $author;
+
+    /**
+     * @return string
+     */
+    public function getFoo()
+    {
+        return $this->foo;
+    }
+
+    /**
+     * @return \JMS\Serializer\Tests\Fixtures\Author
+     */
+    public function getAuthor()
+    {
+        return $this->author;
+    }
+
+
+}

tests/JMS/Serializer/Tests/Serializer/JsonSerializationTest.php

@@ -93,6 +93,8 @@ protected function getContent($key)
             $outputs['car_without_type'] = '{"km":5}';
             $outputs['garage'] = '{"vehicles":[{"km":3,"type":"car"},{"km":1,"type":"moped"}]}';
             $outputs['tree'] = '{"tree":{"children":[{"children":[{"children":[],"foo":"bar"}],"foo":"bar"}],"foo":"bar"}}';
+            $outputs['object_with_object_property_no_array_to_author'] = '{"foo": "bar", "author": "baz"}';
+            $outputs['object_with_object_property'] = '{"foo": "bar", "author": {"full_name": "baz"}}';
         }
 
         if (!isset($outputs[$key])) {
@@ -118,6 +120,28 @@ function(VisitorInterface $visitor, AuthorList $data, array $type, Context $cont
         $this->assertEquals('[{"full_name":"foo","_links":{"details":"http:\/\/foo.bar\/details\/foo","comments":"http:\/\/foo.bar\/details\/foo\/comments"}},{"full_name":"bar","_links":{"details":"http:\/\/foo.bar\/details\/bar","comments":"http:\/\/foo.bar\/details\/bar\/comments"}}]', $this->serialize($list));
     }
 
+
+    /**
+     * @expectedException RuntimeException
+     * @expectedExceptionMessage Invalid data "baz"(string), expected "JMS\Serializer\Tests\Fixtures\Author".
+     */
+    public function testDeserializingObjectWithObjectPropertyWithNoArrayToObject()
+    {
+        $content = $this->getContent('object_with_object_property_no_array_to_author');
+        $object = $this->deserialize($content, 'JMS\Serializer\Tests\Fixtures\ObjectWithObjectProperty');
+        $this->assertEquals('bar', $object->getFoo());
+        $this->assertInstanceOf('JMS\Serializer\Tests\Fixtures\Author', $object->getAuthor());
+    }
+
+    public function testDeserializingObjectWithObjectProperty()
+    {
+        $content = $this->getContent('object_with_object_property');
+        $object = $this->deserialize($content, 'JMS\Serializer\Tests\Fixtures\ObjectWithObjectProperty');
+        $this->assertEquals('bar', $object->getFoo());
+        $this->assertInstanceOf('JMS\Serializer\Tests\Fixtures\Author', $object->getAuthor());
+        $this->assertEquals('baz', $object->getAuthor()->getName());
+    }
+
     public function getPrimitiveTypes()
     {
         return array(