mirror of
https://github.com/retailcrm/NelmioApiDocBundle.git
synced 2025-02-02 15:51:48 +03:00
Form errors parser. Mirrored actual form-errors response by FOSRest. Made sure that FieldErrors is not duplicated.
This commit is contained in:
parent
6d50c200ba
commit
859421df9a
@ -275,6 +275,8 @@ class SwaggerFormatter implements FormatterInterface
|
|||||||
$message = sprintf('See standard HTTP status code reason for %s', $statusCode);
|
$message = sprintf('See standard HTTP status code reason for %s', $statusCode);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$className = !empty($prop['type']['form_errors']) ? $prop['type']['class'] . '.ErrorResponse' : $prop['type']['class'];
|
||||||
|
|
||||||
if (isset($prop['type']['collection']) && $prop['type']['collection'] === true) {
|
if (isset($prop['type']['collection']) && $prop['type']['collection'] === true) {
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -283,14 +285,14 @@ class SwaggerFormatter implements FormatterInterface
|
|||||||
*/
|
*/
|
||||||
$alias = $prop['type']['collectionName'];
|
$alias = $prop['type']['collectionName'];
|
||||||
|
|
||||||
$newName = sprintf('%s[%s]', $prop['type']['class'], $alias);
|
$newName = sprintf('%s[%s]', $className, $alias);
|
||||||
$collId =
|
$collId =
|
||||||
$this->registerModel(
|
$this->registerModel(
|
||||||
$newName,
|
$newName,
|
||||||
array(
|
array(
|
||||||
$alias => array(
|
$alias => array(
|
||||||
'dataType' => null,
|
'dataType' => null,
|
||||||
'subType' => $prop['type']['class'],
|
'subType' => $className,
|
||||||
'actualType' => DataTypes::COLLECTION,
|
'actualType' => DataTypes::COLLECTION,
|
||||||
'required' => true,
|
'required' => true,
|
||||||
'readonly' => true,
|
'readonly' => true,
|
||||||
@ -307,10 +309,11 @@ class SwaggerFormatter implements FormatterInterface
|
|||||||
'responseModel' => $collId
|
'responseModel' => $collId
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
$responseModel = array(
|
$responseModel = array(
|
||||||
'code' => $statusCode,
|
'code' => $statusCode,
|
||||||
'message' => $message,
|
'message' => $message,
|
||||||
'responseModel' => $this->registerModel($prop['type']['class'], $prop['model'], ''),
|
'responseModel' => $this->registerModel($className, $prop['model'], ''),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
$responseMessages[$statusCode] = $responseModel;
|
$responseMessages[$statusCode] = $responseModel;
|
||||||
|
128
Parser/FormErrorsParser.php
Normal file
128
Parser/FormErrorsParser.php
Normal file
@ -0,0 +1,128 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This file is part of the NelmioApiDocBundle.
|
||||||
|
*
|
||||||
|
* (c) Nelmio <hello@nelm.io>
|
||||||
|
*
|
||||||
|
* For the full copyright and license information, please view the LICENSE
|
||||||
|
* file that was distributed with this source code.
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace Nelmio\ApiDocBundle\Parser;
|
||||||
|
|
||||||
|
use Nelmio\ApiDocBundle\DataTypes;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author Bez Hermoso <bezalelhermoso@gmail.com>
|
||||||
|
*/
|
||||||
|
class FormErrorsParser implements ParserInterface, PostParserInterface
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Return true/false whether this class supports parsing the given class.
|
||||||
|
*
|
||||||
|
* @param array $item containing the following fields: class, groups. Of which groups is optional
|
||||||
|
*
|
||||||
|
* @return boolean
|
||||||
|
*/
|
||||||
|
public function supports(array $item)
|
||||||
|
{
|
||||||
|
return isset($item['form_errors']) && $item['form_errors'] === true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function parse(array $item)
|
||||||
|
{
|
||||||
|
return array();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Overrides the root parameters to contain these parameters instead:
|
||||||
|
* - status_code: 400
|
||||||
|
* - message: "Validation failed"
|
||||||
|
* - errors: contains the original parameters, but all types are changed to array of strings (array of errors for each field)
|
||||||
|
*
|
||||||
|
* @param array $item
|
||||||
|
* @param array $parameters
|
||||||
|
*
|
||||||
|
* @return array
|
||||||
|
*/
|
||||||
|
public function postParse(array $item, array $parameters)
|
||||||
|
{
|
||||||
|
$params = $parameters;
|
||||||
|
|
||||||
|
foreach ($params as $name => $data) {
|
||||||
|
$params[$name] = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
$params['status_code'] = array(
|
||||||
|
'dataType' => 'integer',
|
||||||
|
'actualType' => DataTypes::INTEGER,
|
||||||
|
'subType' => null,
|
||||||
|
'required' => false,
|
||||||
|
'description' => 'The status code',
|
||||||
|
'readonly' => true,
|
||||||
|
'default' => 400,
|
||||||
|
);
|
||||||
|
|
||||||
|
$params['message'] = array(
|
||||||
|
'dataType' => 'string',
|
||||||
|
'actualType' => DataTypes::STRING,
|
||||||
|
'subType' => null,
|
||||||
|
'required' => false,
|
||||||
|
'description' => 'The error message',
|
||||||
|
'default' => 'Validation failed.',
|
||||||
|
);
|
||||||
|
|
||||||
|
$params['errors'] = array(
|
||||||
|
'dataType' => 'errors',
|
||||||
|
'actualType' => DataTypes::MODEL,
|
||||||
|
'subType' => sprintf('%s.FormErrors', $item['class']),
|
||||||
|
'required' => false,
|
||||||
|
'description' => 'Errors',
|
||||||
|
'readonly' => true,
|
||||||
|
'children' => $this->doPostParse($parameters),
|
||||||
|
);
|
||||||
|
|
||||||
|
return $params;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function doPostParse(array $parameters, $attachFieldErrors = true, array $propertyPath = array())
|
||||||
|
{
|
||||||
|
$data = array();
|
||||||
|
|
||||||
|
foreach ($parameters as $name => $parameter) {
|
||||||
|
|
||||||
|
$data[$name] = array(
|
||||||
|
'dataType' => 'parameter errors',
|
||||||
|
'actualType' => DataTypes::MODEL,
|
||||||
|
'subType' => 'FieldErrors',
|
||||||
|
'required' => false,
|
||||||
|
'description' => 'Errors on the parameter',
|
||||||
|
'readonly' => true,
|
||||||
|
'children' => array(
|
||||||
|
'errors' => array(
|
||||||
|
'dataType' => 'array of errors',
|
||||||
|
'actualType' => DataTypes::COLLECTION,
|
||||||
|
'subType' => 'string',
|
||||||
|
'required' => false,
|
||||||
|
'dscription' => '',
|
||||||
|
'readonly' => true,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
|
||||||
|
if ($parameter['actualType'] === DataTypes::MODEL) {
|
||||||
|
$propertyPath[] = $name;
|
||||||
|
$data[$name]['subType'] = sprintf('%s.FieldErrors[%s]', $parameter['subType'], implode('.', $propertyPath));
|
||||||
|
$data[$name]['children'] = $this->doPostParse($parameter['children'], $attachFieldErrors, $propertyPath);
|
||||||
|
} else {
|
||||||
|
if ($attachFieldErrors === false) {
|
||||||
|
unset($data[$name]['children']);
|
||||||
|
}
|
||||||
|
$attachFieldErrors = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return $data;
|
||||||
|
}
|
||||||
|
}
|
@ -15,6 +15,7 @@
|
|||||||
<parameter key="nelmio_api_doc.extractor.handler.phpdoc.class">Nelmio\ApiDocBundle\Extractor\Handler\PhpDocHandler</parameter>
|
<parameter key="nelmio_api_doc.extractor.handler.phpdoc.class">Nelmio\ApiDocBundle\Extractor\Handler\PhpDocHandler</parameter>
|
||||||
|
|
||||||
<parameter key="nelmio_api_doc.parser.collection_parser.class">Nelmio\ApiDocBundle\Parser\CollectionParser</parameter>
|
<parameter key="nelmio_api_doc.parser.collection_parser.class">Nelmio\ApiDocBundle\Parser\CollectionParser</parameter>
|
||||||
|
<parameter key="nelmio_api_doc.parser.form_errors_parser.class">Nelmio\ApiDocBundle\Parser\FormErrorsParser</parameter>
|
||||||
</parameters>
|
</parameters>
|
||||||
|
|
||||||
<services>
|
<services>
|
||||||
@ -58,6 +59,9 @@
|
|||||||
<service id="nelmio_api_doc.parser.collection_parser" class="%nelmio_api_doc.parser.collection_parser.class%">
|
<service id="nelmio_api_doc.parser.collection_parser" class="%nelmio_api_doc.parser.collection_parser.class%">
|
||||||
<tag name="nelmio_api_doc.extractor.parser" />
|
<tag name="nelmio_api_doc.extractor.parser" />
|
||||||
</service>
|
</service>
|
||||||
|
<service id="nelmio_api_doc.parser.form_errors_parser" class="%nelmio_api_doc.parser.form_errors_parser.class%">
|
||||||
|
<tag name="nelmio_api_doc.extractor.parser" />
|
||||||
|
</service>
|
||||||
</services>
|
</services>
|
||||||
|
|
||||||
</container>
|
</container>
|
||||||
|
@ -48,7 +48,10 @@ class ResourceController
|
|||||||
* @ApiDoc(
|
* @ApiDoc(
|
||||||
* description="Create a new resource.",
|
* description="Create a new resource.",
|
||||||
* input={"class" = "Nelmio\ApiDocBundle\Tests\Fixtures\Form\SimpleType", "name" = ""},
|
* input={"class" = "Nelmio\ApiDocBundle\Tests\Fixtures\Form\SimpleType", "name" = ""},
|
||||||
* output="Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsNested"
|
* output="Nelmio\ApiDocBundle\Tests\Fixtures\Model\JmsNested",
|
||||||
|
* responseMap={
|
||||||
|
* 400 = {"class" = "Nelmio\ApiDocBundle\Tests\Fixtures\Form\SimpleType", "form_errors" = true}
|
||||||
|
* }
|
||||||
* )
|
* )
|
||||||
*/
|
*/
|
||||||
public function createResourceAction()
|
public function createResourceAction()
|
||||||
|
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user