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

Add missing array key checks

Browse Source 
Fixes #423
This commit is contained in:
William DURAND 2014-06-27 10:07:03 +02:00
parent 03f6142a84
commit a817081ab2
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Formatter/AbstractFormatter.php
View File

@ -70,16 +70,16 @@ abstract class AbstractFormatter implements FormatterInterface
$newName = $this->getNewName($name, $info, $parentName); $newName = $this->getNewName($name, $info, $parentName);
$newParams[$newName] = array( $newParams[$newName] = array(
'dataType' => $info['dataType'], 'dataType' => $info['dataType'],
'readonly' => array_key_exists('readonly', $info) ? $info['readonly'] : null, 'readonly' => array_key_exists('readonly', $info) ? $info['readonly'] : null,
'required' => $info['required'], 'required' => $info['required'],
'default' => array_key_exists('default', $info) ? $info['default'] : null, 'default' => array_key_exists('default', $info) ? $info['default'] : null,
'description' => array_key_exists('description', $info) ? $info['description'] : null, 'description' => array_key_exists('description', $info) ? $info['description'] : null,
'format' => array_key_exists('format', $info) ? $info['format'] : null, 'format' => array_key_exists('format', $info) ? $info['format'] : null,
'sinceVersion' => array_key_exists('sinceVersion', $info) ? $info['sinceVersion'] : null, 'sinceVersion' => array_key_exists('sinceVersion', $info) ? $info['sinceVersion'] : null,
'untilVersion' => array_key_exists('untilVersion', $info) ? $info['untilVersion'] : null, 'untilVersion' => array_key_exists('untilVersion', $info) ? $info['untilVersion'] : null,
'actualType' => array_key_exists('actualType', $info) ? $info['actualType'] : null, 'actualType' => array_key_exists('actualType', $info) ? $info['actualType'] : null,
'subType' => array_key_exists('subType', $info) ? $info['subType'] : null, 'subType' => array_key_exists('subType', $info) ? $info['subType'] : null,
); );
if (isset($info['children']) && (!$info['readonly'] || !$ignoreNestedReadOnly)) { if (isset($info['children']) && (!$info['readonly'] || !$ignoreNestedReadOnly)) {
@ -103,8 +103,14 @@ abstract class AbstractFormatter implements FormatterInterface
*/ */
protected function getNewName($name, $data, $parentName = null) protected function getNewName($name, $data, $parentName = null)
{ {
$array = '';
$newName = ($parentName) ? sprintf("%s[%s]", $parentName, $name) : $name; $newName = ($parentName) ? sprintf("%s[%s]", $parentName, $name) : $name;
$array = $data['actualType'] == DataTypes::COLLECTION && $data['subType'] !== null ? '[]' : '';
if (isset($data['actualType']) && $data['actualType'] == DataTypes::COLLECTION
&& isset($data['subType']) && $data['subType'] !== null
) {
$array = '[]';
}
return sprintf("%s%s", $newName, $array); return sprintf("%s%s", $newName, $array);
} }