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

Merge pull request #270 from sroze/patch-1

Browse Source 
Support "callback" on Choice Validator
This commit is contained in:
William Durand 2013-11-06 17:53:53 -08:00
commit 8728e825ea
1 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Parser/ValidationParser.php
View File

@ -11,6 +11,7 @@
namespace Nelmio\ApiDocBundle\Parser; namespace Nelmio\ApiDocBundle\Parser;
use Symfony\Component\Validator\Exception\ConstraintDefinitionException;
use Symfony\Component\Validator\MetadataFactoryInterface; use Symfony\Component\Validator\MetadataFactoryInterface;
use Symfony\Component\Validator\Constraint; use Symfony\Component\Validator\Constraint;
@ -62,7 +63,7 @@ class ValidationParser implements ParserInterface, PostParserInterface
$constraints = $propdata->getConstraints(); $constraints = $propdata->getConstraints();
foreach($constraints as $constraint) { foreach($constraints as $constraint) {
$vparams = $this->parseConstraint($constraint, $vparams); $vparams = $this->parseConstraint($constraint, $vparams, $className);
} }
} }
@ -118,7 +119,7 @@ class ValidationParser implements ParserInterface, PostParserInterface
* @param array $vparams The existing validation parameters. * @param array $vparams The existing validation parameters.
* @return mixed The parsed list of validation parameters. * @return mixed The parsed list of validation parameters.
*/ */
protected function parseConstraint(Constraint $constraint, $vparams) protected function parseConstraint(Constraint $constraint, $vparams, $className)
{ {
$class = substr(get_class($constraint), strlen('Symfony\\Component\\Validator\\Constraints\\')); $class = substr(get_class($constraint), strlen('Symfony\\Component\\Validator\\Constraints\\'));
@ -150,7 +151,8 @@ class ValidationParser implements ParserInterface, PostParserInterface
$vparams['format'][] = '{length: ' . join(', ', $messages) . '}'; $vparams['format'][] = '{length: ' . join(', ', $messages) . '}';
break; break;
case 'Choice': case 'Choice':
$format = '[' . join('|', $constraint->choices) . ']'; $choices = $this->getChoices($constraint, $className);
$format = '[' . join('|', $choices) . ']';
if($constraint->multiple) { if($constraint->multiple) {
$messages = array(); $messages = array();
if(isset($constraint->min)) { if(isset($constraint->min)) {
@ -175,4 +177,29 @@ class ValidationParser implements ParserInterface, PostParserInterface
return $vparams; return $vparams;
} }
/**
* Return Choice constraint choices.
*
* @param Constraint $constraint
* @param $className
* @return array
* @throws \Symfony\Component\Validator\Exception\ConstraintDefinitionException
*/
protected function getChoices (Constraint $constraint, $className)
{
if ($constraint->callback) {
if (is_callable(array($className, $constraint->callback))) {
$choices = call_user_func(array($className, $constraint->callback));
} elseif (is_callable($constraint->callback)) {
$choices = call_user_func($constraint->callback);
} else {
throw new ConstraintDefinitionException('The Choice constraint expects a valid callback');
}
} else {
$choices = $constraint->choices;
}
return $choices;
}
} }