RetailCRM-Mirror/NelmioApiDocBundle
1
0
Fork 0
mirror of https://github.com/retailcrm/NelmioApiDocBundle.git synced 2025-04-02 21:36:14 +03:00
Code Issues Projects Releases Wiki Activity

Empty string is now a valid default parameter value that is successfully

Browse source 
merged with other parameters
Preventing access of uninitialized array key 'default'
Added functional test case for mergeParameters that covers this issue
This commit is contained in:
Florian Strübe 2015-11-09 22:22:00 +01:00
parent be90e8aad6
commit e8a2f690ab
2 changed files with 40 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Extractor/ApiDocExtractor.php
View file

@ -484,7 +484,11 @@ class ApiDocExtractor
$v1[$name] = $value;
}
} elseif ($name == 'default') {
$v1[$name] = $value ?: $v1[$name];
if (isset($v1[$name])) {
$v1[$name] = isset($value) ? $value : $v1[$name];
} else {
$v1[$name] = isset($value) ? $value : null;
}
} else {
$v1[$name] = $value;
}

35
Tests/Extractor/ApiDocExtractorTest.php
View file

@ -436,4 +436,39 @@ class ApiDocExtractorTest extends WebTestCase
$this->assertEquals('object (JmsNested)', $array['parameters']['nested']['dataType']);
$this->assertEquals('string', $array['parameters']['nested']['children']['bar']['dataType']);
}
public function testMergeParametersDefaultKeyNotExistingInFirstArray()
{
$container = $this->getContainer();
$extractor = $container->get('nelmio_api_doc.extractor.api_doc_extractor');
$mergeMethod = new \ReflectionMethod('Nelmio\ApiDocBundle\Extractor\ApiDocExtractor', 'mergeParameters');
$mergeMethod->setAccessible(true);
$p1 = [
'myPropName' => [
'dataType' => 'string',
'actualType' => 'string',
'subType' => null,
'required' => null,
'description' => null,
'readonly' => null,
]
];
$p2 = [
'myPropName' => [
'dataType' => 'string',
'actualType' => 'string',
'subType' => null,
'required' => null,
'description' => null,
'readonly' => null,
'default' => '',
]
];
$mergedResult = $mergeMethod->invokeArgs($extractor, [$p1, $p2]);
$this->assertEquals($p2, $mergedResult);
}
}