diff --git a/Parser/JmsMetadataParser.php b/Parser/JmsMetadataParser.php index ed5cb43..269d92f 100644 --- a/Parser/JmsMetadataParser.php +++ b/Parser/JmsMetadataParser.php @@ -111,8 +111,6 @@ class JmsMetadataParser implements ParserInterface */ protected function processDataType(PropertyMetadata $item) { - $type = is_string($item->type) ? $item->type : $item->type['name']; - //check for a type inside something that could be treated as an array if ($nestedType = $this->getNestedTypeInArray($item)) { if ($this->isPrimitive($nestedType)) { @@ -130,6 +128,8 @@ class JmsMetadataParser implements ParserInterface ); } + $type = $item->type['name']; + //could be basic type if ($this->isPrimitive($type)) { return array( diff --git a/Tests/Parser/JmsMetadataParserTest.php b/Tests/Parser/JmsMetadataParserTest.php index bd96b48..88050a9 100644 --- a/Tests/Parser/JmsMetadataParserTest.php +++ b/Tests/Parser/JmsMetadataParserTest.php @@ -16,7 +16,9 @@ class JmsMetadataParserTest extends \PHPUnit_Framework_TestCase ->getMock(); $propertyMetadataFoo = new PropertyMetadata('Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsNested', 'foo'); - $propertyMetadataFoo->type = 'DateTime'; + $propertyMetadataFoo->type = array( + 'name' => 'DateTime' + ); $propertyMetadataBar = new PropertyMetadata('Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsNested', 'bar'); $propertyMetadataBar->type = array( diff --git a/composer.json b/composer.json index 9779b6a..a3afbce 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ "symfony/browser-kit": ">=2.1,<2.3-dev", "symfony/validator": ">=2.1,<2.3-dev", "symfony/yaml": ">=2.1,<2.3-dev", - "friendsofsymfony/rest-bundle": "dev-jms_serlializer_1_0", + "friendsofsymfony/rest-bundle": "dev-master", "jms/serializer-bundle": "1.0.*" }, "minimum-stability": "dev",