From d78f8887a983aef9e0c5e07fc2d97755db3e742e Mon Sep 17 00:00:00 2001 From: Vitaliy Chesnokov Date: Wed, 24 Apr 2019 17:46:26 +0300 Subject: [PATCH] Pass the data about field name and field class to template --- Extractor/ApiDocExtractor.php | 26 ++++ Formatter/AbstractFormatter.php | 2 + .../testFormat-result-no-dunglas.php | 141 +++++++++++++++++ Tests/Formatter/testFormat-result.php | 142 +++++++++++++++++- 4 files changed, 310 insertions(+), 1 deletion(-) diff --git a/Extractor/ApiDocExtractor.php b/Extractor/ApiDocExtractor.php index cb182b3..f62ef94 100644 --- a/Extractor/ApiDocExtractor.php +++ b/Extractor/ApiDocExtractor.php @@ -350,6 +350,7 @@ class ApiDocExtractor } } + $parameters = $this->setParentClasses($parameters); $parameters = $this->clearClasses($parameters); $parameters = $this->generateHumanReadableTypes($parameters); @@ -422,6 +423,7 @@ class ApiDocExtractor } } + $parameters = $this->setParentClasses($parameters); $parameters = $this->clearClasses($parameters); $parameters = $this->generateHumanReadableTypes($parameters); @@ -556,6 +558,30 @@ class ApiDocExtractor } } + /** + * Set parent class to children + * + * @param array $array The source array. + * @return array The updated array. + */ + protected function setParentClasses($array) + { + if (is_array($array)) { + foreach ($array as $k => $v) { + if (isset($v['children'])) { + if (isset($v['class'])) { + foreach ($v['children'] as $key => $item) { + $array[$k]['children'][$key]['parentClass'] = $v['class']; + $array[$k]['children'][$key]['field'] = $key; + } + } + $array[$k]['children'] = $this->setParentClasses($array[$k]['children']); + } + } + } + return $array; + } + /** * Clears the temporary 'class' parameter from the parameters array before it is returned. * diff --git a/Formatter/AbstractFormatter.php b/Formatter/AbstractFormatter.php index f26da59..981e294 100644 --- a/Formatter/AbstractFormatter.php +++ b/Formatter/AbstractFormatter.php @@ -116,6 +116,8 @@ abstract class AbstractFormatter implements FormatterInterface 'untilVersion' => array_key_exists('untilVersion', $info) ? $info['untilVersion'] : null, 'actualType' => array_key_exists('actualType', $info) ? $info['actualType'] : null, 'subType' => array_key_exists('subType', $info) ? $info['subType'] : null, + 'parentClass' => array_key_exists('parentClass', $info) ? $info['parentClass'] : null, + 'field' => array_key_exists('field', $info) ? $info['field'] : null, ); if (isset($info['children']) && (!$info['readonly'] || !$ignoreNestedReadOnly)) { diff --git a/Tests/Formatter/testFormat-result-no-dunglas.php b/Tests/Formatter/testFormat-result-no-dunglas.php index 0dd70c7..66d7b2f 100644 --- a/Tests/Formatter/testFormat-result-no-dunglas.php +++ b/Tests/Formatter/testFormat-result-no-dunglas.php @@ -109,6 +109,8 @@ return array ( 'readonly' => true, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsNested', + 'field' => 'foo', ), 'bar' => array ( @@ -121,6 +123,8 @@ return array ( 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsNested', + 'field' => 'bar', ), 'baz' => array ( @@ -135,6 +139,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsNested', + 'field' => 'baz', ), 'circular' => array ( @@ -147,6 +153,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsNested', + 'field' => 'circular', ), 'parent' => array ( @@ -159,6 +167,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsNested', + 'field' => 'parent', 'children' => array ( 'foo' => @@ -172,6 +182,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsTest', + 'field' => 'foo', ), 'bar' => array ( @@ -184,6 +196,8 @@ With multiple lines.', 'readonly' => true, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsTest', + 'field' => 'bar', ), 'number' => array ( @@ -196,6 +210,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsTest', + 'field' => 'number', ), 'arr' => array ( @@ -208,6 +224,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsTest', + 'field' => 'arr', ), 'nested' => array ( @@ -220,6 +238,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsTest', + 'field' => 'nested', ), 'nested_array' => array ( @@ -232,6 +252,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsTest', + 'field' => 'nested_array', ), ), ), @@ -246,6 +268,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => '0.2', 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsNested', + 'field' => 'since', ), 'until' => array ( @@ -258,6 +282,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => '0.3', + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsNested', + 'field' => 'until', ), 'since_and_until' => array ( @@ -270,6 +296,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => '0.4', 'untilVersion' => '0.5', + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsNested', + 'field' => 'since_and_until', ), ), ), @@ -547,6 +575,8 @@ With multiple lines.', 'readonly' => true, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsNested', + 'field' => 'foo', ), 'bar' => array ( @@ -559,6 +589,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsNested', + 'field' => 'bar', ), 'baz' => array ( @@ -573,6 +605,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsNested', + 'field' => 'baz', ), 'circular' => array ( @@ -585,6 +619,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsNested', + 'field' => 'circular', ), 'parent' => array ( @@ -597,6 +633,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsNested', + 'field' => 'parent', 'children' => array ( 'foo' => @@ -610,6 +648,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsTest', + 'field' => 'foo', ), 'bar' => array ( @@ -622,6 +662,8 @@ With multiple lines.', 'readonly' => true, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsTest', + 'field' => 'bar', ), 'number' => array ( @@ -634,6 +676,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsTest', + 'field' => 'number', ), 'arr' => array ( @@ -646,6 +690,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsTest', + 'field' => 'arr', ), 'nested' => array ( @@ -658,6 +704,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsTest', + 'field' => 'nested', ), 'nested_array' => array ( @@ -670,6 +718,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsTest', + 'field' => 'nested_array', ), ), ), @@ -684,6 +734,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => '0.2', 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsNested', + 'field' => 'since', ), 'until' => array ( @@ -696,6 +748,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => '0.3', + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsNested', + 'field' => 'until', ), 'since_and_until' => array ( @@ -708,6 +762,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => '0.4', 'untilVersion' => '0.5', + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsNested', + 'field' => 'since_and_until', ), ), ), @@ -735,6 +791,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsTest', + 'field' => 'foo', ), 'bar' => array ( @@ -747,6 +805,8 @@ With multiple lines.', 'readonly' => true, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsTest', + 'field' => 'bar', ), 'number' => array ( @@ -759,6 +819,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsTest', + 'field' => 'number', ), 'arr' => array ( @@ -771,6 +833,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsTest', + 'field' => 'arr', ), 'nested' => array ( @@ -783,6 +847,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsTest', + 'field' => 'nested', ), 'nested_array' => array ( @@ -795,6 +861,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsTest', + 'field' => 'nested_array', ), ), ), @@ -1333,6 +1401,8 @@ With multiple lines.', 'readonly' => true, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsNested', + 'field' => 'foo', ), 'bar' => array ( @@ -1345,6 +1415,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsNested', + 'field' => 'bar', ), 'baz' => array ( @@ -1359,6 +1431,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsNested', + 'field' => 'baz', ), 'circular' => array ( @@ -1371,6 +1445,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsNested', + 'field' => 'circular', ), 'parent' => array ( @@ -1383,6 +1459,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsNested', + 'field' => 'parent', 'children' => array ( 'foo' => @@ -1396,6 +1474,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsTest', + 'field' => 'foo', ), 'bar' => array ( @@ -1408,6 +1488,8 @@ With multiple lines.', 'readonly' => true, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsTest', + 'field' => 'bar', ), 'number' => array ( @@ -1420,6 +1502,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsTest', + 'field' => 'number', ), 'arr' => array ( @@ -1432,6 +1516,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsTest', + 'field' => 'arr', ), 'nested' => array ( @@ -1444,6 +1530,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsTest', + 'field' => 'nested', ), 'nested_array' => array ( @@ -1456,6 +1544,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsTest', + 'field' => 'nested_array', ), ), ), @@ -1470,6 +1560,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => '0.2', 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsNested', + 'field' => 'since', ), 'until' => array ( @@ -1482,6 +1574,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => '0.3', + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsNested', + 'field' => 'until', ), 'since_and_until' => array ( @@ -1494,6 +1588,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => '0.4', 'untilVersion' => '0.5', + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsNested', + 'field' => 'since_and_until', ), ), ), @@ -1676,6 +1772,8 @@ And, it supports multilines until the first \'@\' char.', 'readonly' => true, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsNested', + 'field' => 'foo', ), 'bar' => array ( @@ -1688,6 +1786,8 @@ And, it supports multilines until the first \'@\' char.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsNested', + 'field' => 'bar', ), 'baz' => array ( @@ -1702,6 +1802,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsNested', + 'field' => 'baz', ), 'circular' => array ( @@ -1714,6 +1816,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsNested', + 'field' => 'circular', ), 'parent' => array ( @@ -1726,6 +1830,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsNested', + 'field' => 'parent', 'children' => array ( 'foo' => @@ -1739,6 +1845,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsTest', + 'field' => 'foo', ), 'bar' => array ( @@ -1751,6 +1859,8 @@ With multiple lines.', 'readonly' => true, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsTest', + 'field' => 'bar', ), 'number' => array ( @@ -1763,6 +1873,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsTest', + 'field' => 'number', ), 'arr' => array ( @@ -1775,6 +1887,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsTest', + 'field' => 'arr', ), 'nested' => array ( @@ -1787,6 +1901,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsTest', + 'field' => 'nested', ), 'nested_array' => array ( @@ -1799,6 +1915,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsTest', + 'field' => 'nested_array', ), ), ), @@ -1813,6 +1931,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => '0.2', 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsNested', + 'field' => 'since', ), 'until' => array ( @@ -1825,6 +1945,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => '0.3', + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsNested', + 'field' => 'until', ), 'since_and_until' => array ( @@ -1837,6 +1959,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => '0.4', 'untilVersion' => '0.5', + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsNested', + 'field' => 'since_and_until', ), ), ), @@ -2071,6 +2195,8 @@ With multiple lines.', 'required' => true, 'dataType' => 'string', 'readonly' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\Test', + 'field' => 'a', ), 'b' => array ( @@ -2080,6 +2206,8 @@ With multiple lines.', 'dataType' => 'DateTime', 'readonly' => NULL, 'required' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\Test', + 'field' => 'b', ), ), 'readonly' => NULL, @@ -2119,6 +2247,8 @@ With multiple lines.', 'required' => true, 'dataType' => 'string', 'readonly' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\Test', + 'field' => 'a', ), 'b' => array ( @@ -2128,6 +2258,8 @@ With multiple lines.', 'dataType' => 'DateTime', 'readonly' => NULL, 'required' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\Test', + 'field' => 'b', ), ), ), @@ -2225,6 +2357,8 @@ With multiple lines.', 'required' => true, 'dataType' => 'string', 'readonly' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\Test', + 'field' => 'a', ), 'b' => array ( @@ -2234,6 +2368,8 @@ With multiple lines.', 'dataType' => 'DateTime', 'readonly' => NULL, 'required' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\Test', + 'field' => 'b', ), ), 'readonly' => NULL, @@ -2273,6 +2409,8 @@ With multiple lines.', 'required' => true, 'dataType' => 'string', 'readonly' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\Test', + 'field' => 'a', ), 'b' => array ( @@ -2282,6 +2420,8 @@ With multiple lines.', 'dataType' => 'DateTime', 'readonly' => NULL, 'required' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\Test', + 'field' => 'b', ), ), ), @@ -2333,3 +2473,4 @@ With multiple lines.', ), ), ); + diff --git a/Tests/Formatter/testFormat-result.php b/Tests/Formatter/testFormat-result.php index 9706f21..50437d9 100644 --- a/Tests/Formatter/testFormat-result.php +++ b/Tests/Formatter/testFormat-result.php @@ -4,7 +4,7 @@ use Nelmio\ApiDocBundle\Util\LegacyFormHelper; return array ( '/api/other-resources' => - array ( + array ( 0 => array ( 'method' => 'GET', @@ -104,6 +104,8 @@ return array ( 'readonly' => true, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsNested', + 'field' => 'foo', ), 'bar' => array ( @@ -116,6 +118,8 @@ return array ( 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsNested', + 'field' => 'bar', ), 'baz' => array ( @@ -130,6 +134,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsNested', + 'field' => 'baz', ), 'circular' => array ( @@ -142,6 +148,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsNested', + 'field' => 'circular', ), 'parent' => array ( @@ -154,6 +162,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsNested', + 'field' => 'parent', 'children' => array ( 'foo' => @@ -167,6 +177,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsTest', + 'field' => 'foo', ), 'bar' => array ( @@ -179,6 +191,8 @@ With multiple lines.', 'readonly' => true, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsTest', + 'field' => 'bar', ), 'number' => array ( @@ -191,6 +205,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsTest', + 'field' => 'number', ), 'arr' => array ( @@ -203,6 +219,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsTest', + 'field' => 'arr', ), 'nested' => array ( @@ -215,6 +233,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsTest', + 'field' => 'nested', ), 'nested_array' => array ( @@ -227,6 +247,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsTest', + 'field' => 'nested_array', ), ), ), @@ -241,6 +263,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => '0.2', 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsNested', + 'field' => 'since', ), 'until' => array ( @@ -253,6 +277,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => '0.3', + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsNested', + 'field' => 'until', ), 'since_and_until' => array ( @@ -265,6 +291,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => '0.4', 'untilVersion' => '0.5', + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsNested', + 'field' => 'since_and_until', ), ), ), @@ -540,6 +568,8 @@ With multiple lines.', 'readonly' => true, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsNested', + 'field' => 'foo', ), 'bar' => array ( @@ -552,6 +582,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsNested', + 'field' => 'bar', ), 'baz' => array ( @@ -566,6 +598,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsNested', + 'field' => 'baz', ), 'circular' => array ( @@ -578,6 +612,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsNested', + 'field' => 'circular', ), 'parent' => array ( @@ -590,6 +626,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsNested', + 'field' => 'parent', 'children' => array ( 'foo' => @@ -603,6 +641,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsTest', + 'field' => 'foo', ), 'bar' => array ( @@ -615,6 +655,8 @@ With multiple lines.', 'readonly' => true, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsTest', + 'field' => 'bar', ), 'number' => array ( @@ -627,6 +669,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsTest', + 'field' => 'number', ), 'arr' => array ( @@ -639,6 +683,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsTest', + 'field' => 'arr', ), 'nested' => array ( @@ -651,6 +697,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsTest', + 'field' => 'nested', ), 'nested_array' => array ( @@ -663,6 +711,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsTest', + 'field' => 'nested_array', ), ), ), @@ -677,6 +727,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => '0.2', 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsNested', + 'field' => 'since', ), 'until' => array ( @@ -689,6 +741,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => '0.3', + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsNested', + 'field' => 'until', ), 'since_and_until' => array ( @@ -701,6 +755,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => '0.4', 'untilVersion' => '0.5', + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsNested', + 'field' => 'since_and_until', ), ), ), @@ -728,6 +784,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsTest', + 'field' => 'foo', ), 'bar' => array ( @@ -740,6 +798,8 @@ With multiple lines.', 'readonly' => true, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsTest', + 'field' => 'bar', ), 'number' => array ( @@ -752,6 +812,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsTest', + 'field' => 'number', ), 'arr' => array ( @@ -764,6 +826,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsTest', + 'field' => 'arr', ), 'nested' => array ( @@ -776,6 +840,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsTest', + 'field' => 'nested', ), 'nested_array' => array ( @@ -788,6 +854,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsTest', + 'field' => 'nested_array', ), ), ), @@ -1325,6 +1393,8 @@ With multiple lines.', 'readonly' => true, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsNested', + 'field' => 'foo', ), 'bar' => array ( @@ -1337,6 +1407,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsNested', + 'field' => 'bar', ), 'baz' => array ( @@ -1351,6 +1423,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsNested', + 'field' => 'baz', ), 'circular' => array ( @@ -1363,6 +1437,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsNested', + 'field' => 'circular', ), 'parent' => array ( @@ -1375,6 +1451,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsNested', + 'field' => 'parent', 'children' => array ( 'foo' => @@ -1388,6 +1466,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsTest', + 'field' => 'foo', ), 'bar' => array ( @@ -1400,6 +1480,8 @@ With multiple lines.', 'readonly' => true, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsTest', + 'field' => 'bar', ), 'number' => array ( @@ -1412,6 +1494,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsTest', + 'field' => 'number', ), 'arr' => array ( @@ -1424,6 +1508,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsTest', + 'field' => 'arr', ), 'nested' => array ( @@ -1436,6 +1522,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsTest', + 'field' => 'nested', ), 'nested_array' => array ( @@ -1448,6 +1536,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsTest', + 'field' => 'nested_array', ), ), ), @@ -1462,6 +1552,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => '0.2', 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsNested', + 'field' => 'since', ), 'until' => array ( @@ -1474,6 +1566,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => '0.3', + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsNested', + 'field' => 'until', ), 'since_and_until' => array ( @@ -1486,6 +1580,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => '0.4', 'untilVersion' => '0.5', + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsNested', + 'field' => 'since_and_until', ), ), ), @@ -1830,6 +1926,8 @@ And, it supports multilines until the first \'@\' char.', 'readonly' => true, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsNested', + 'field' => 'foo', ), 'bar' => array ( @@ -1842,6 +1940,8 @@ And, it supports multilines until the first \'@\' char.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsNested', + 'field' => 'bar', ), 'baz' => array ( @@ -1856,6 +1956,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsNested', + 'field' => 'baz', ), 'circular' => array ( @@ -1868,6 +1970,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsNested', + 'field' => 'circular', ), 'parent' => array ( @@ -1880,6 +1984,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsNested', + 'field' => 'parent', 'children' => array ( 'foo' => @@ -1893,6 +1999,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsTest', + 'field' => 'foo', ), 'bar' => array ( @@ -1905,6 +2013,8 @@ With multiple lines.', 'readonly' => true, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsTest', + 'field' => 'bar', ), 'number' => array ( @@ -1917,6 +2027,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsTest', + 'field' => 'number', ), 'arr' => array ( @@ -1929,6 +2041,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsTest', + 'field' => 'arr', ), 'nested' => array ( @@ -1941,6 +2055,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsTest', + 'field' => 'nested', ), 'nested_array' => array ( @@ -1953,6 +2069,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsTest', + 'field' => 'nested_array', ), ), ), @@ -1967,6 +2085,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => '0.2', 'untilVersion' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsNested', + 'field' => 'since', ), 'until' => array ( @@ -1979,6 +2099,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => NULL, 'untilVersion' => '0.3', + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsNested', + 'field' => 'until', ), 'since_and_until' => array ( @@ -1991,6 +2113,8 @@ With multiple lines.', 'readonly' => false, 'sinceVersion' => '0.4', 'untilVersion' => '0.5', + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsNested', + 'field' => 'since_and_until', ), ), ), @@ -2225,6 +2349,8 @@ With multiple lines.', 'required' => true, 'dataType' => 'string', 'readonly' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\Test', + 'field' => 'a', ), 'b' => array ( @@ -2234,6 +2360,8 @@ With multiple lines.', 'dataType' => 'DateTime', 'readonly' => NULL, 'required' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\Test', + 'field' => 'b', ), ), 'readonly' => NULL, @@ -2273,6 +2401,8 @@ With multiple lines.', 'required' => true, 'dataType' => 'string', 'readonly' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\Test', + 'field' => 'a', ), 'b' => array ( @@ -2282,6 +2412,8 @@ With multiple lines.', 'dataType' => 'DateTime', 'readonly' => NULL, 'required' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\Test', + 'field' => 'b', ), ), ), @@ -2379,6 +2511,8 @@ With multiple lines.', 'required' => true, 'dataType' => 'string', 'readonly' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\Test', + 'field' => 'a', ), 'b' => array ( @@ -2388,6 +2522,8 @@ With multiple lines.', 'dataType' => 'DateTime', 'readonly' => NULL, 'required' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\Test', + 'field' => 'b', ), ), 'readonly' => NULL, @@ -2427,6 +2563,8 @@ With multiple lines.', 'required' => true, 'dataType' => 'string', 'readonly' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\Test', + 'field' => 'a', ), 'b' => array ( @@ -2436,6 +2574,8 @@ With multiple lines.', 'dataType' => 'DateTime', 'readonly' => NULL, 'required' => NULL, + 'parentClass' => 'Nelmio\ApiDocBundle\Tests\Fixtures\Model\Test', + 'field' => 'b', ), ), ),