Merge PR #298 from 'skler/extended_class

This commit is contained in:
William DURAND 2013-12-28 18:28:07 +01:00
commit af7c04cdfc
3 changed files with 26 additions and 0 deletions

View File

@ -200,6 +200,15 @@ class TestController
{
}
/**
* @ApiDoc(
* output="Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsChild"
* )
*/
public function jmsReturnNestedExtendedOutputAction()
{
}
/**
* @ApiDoc(
* output="Nelmio\ApiDocBundle\Tests\Fixtures\Model\MultipleTest"

View File

@ -0,0 +1,13 @@
<?php
namespace Nelmio\ApiDocBundle\Tests\Fixtures\Model;
use JMS\Serializer\Annotation as JMS;
class JmsChild extends JmsTest
{
/**
* @JMS\Type("string");
*/
public $child;
}

View File

@ -122,6 +122,10 @@ test_return_nested_output:
pattern: /return-nested-output
defaults: { _controller: NelmioApiDocTestBundle:Test:jmsReturnNestedOutput, _format: json }
test_return_nested_extend_output:
pattern: /return-nested-extend-output
defaults: { _controller: NelmioApiDocTestBundle:Test:jmsReturnNestedExtendOutput, _format: json }
test_route_18:
pattern: /z-return-jms-and-validator-output
defaults: { _controller: NelmioApiDocTestBundle:Test:zReturnJmsAndValidationOutput }