mirror of
https://github.com/retailcrm/NelmioApiDocBundle.git
synced 2025-02-02 15:51:48 +03:00
Fixed version of rest-bundle
Removed check of type string
This commit is contained in:
parent
5acf1adced
commit
5213b7db71
@ -111,8 +111,6 @@ class JmsMetadataParser implements ParserInterface
|
|||||||
*/
|
*/
|
||||||
protected function processDataType(PropertyMetadata $item)
|
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
|
//check for a type inside something that could be treated as an array
|
||||||
if ($nestedType = $this->getNestedTypeInArray($item)) {
|
if ($nestedType = $this->getNestedTypeInArray($item)) {
|
||||||
if ($this->isPrimitive($nestedType)) {
|
if ($this->isPrimitive($nestedType)) {
|
||||||
@ -130,6 +128,8 @@ class JmsMetadataParser implements ParserInterface
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$type = $item->type['name'];
|
||||||
|
|
||||||
//could be basic type
|
//could be basic type
|
||||||
if ($this->isPrimitive($type)) {
|
if ($this->isPrimitive($type)) {
|
||||||
return array(
|
return array(
|
||||||
|
@ -16,7 +16,9 @@ class JmsMetadataParserTest extends \PHPUnit_Framework_TestCase
|
|||||||
->getMock();
|
->getMock();
|
||||||
|
|
||||||
$propertyMetadataFoo = new PropertyMetadata('Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsNested', 'foo');
|
$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 = new PropertyMetadata('Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsNested', 'bar');
|
||||||
$propertyMetadataBar->type = array(
|
$propertyMetadataBar->type = array(
|
||||||
|
@ -25,7 +25,7 @@
|
|||||||
"symfony/browser-kit": ">=2.1,<2.3-dev",
|
"symfony/browser-kit": ">=2.1,<2.3-dev",
|
||||||
"symfony/validator": ">=2.1,<2.3-dev",
|
"symfony/validator": ">=2.1,<2.3-dev",
|
||||||
"symfony/yaml": ">=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.*"
|
"jms/serializer-bundle": "1.0.*"
|
||||||
},
|
},
|
||||||
"minimum-stability": "dev",
|
"minimum-stability": "dev",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user