[Validator] Improved visitor names
This commit is contained in:
parent
08172bfe7b
commit
aeb68228b1
@ -12,11 +12,9 @@
|
|||||||
namespace Symfony\Component\Validator\NodeTraverser;
|
namespace Symfony\Component\Validator\NodeTraverser;
|
||||||
|
|
||||||
use Symfony\Component\Validator\Context\ExecutionContextInterface;
|
use Symfony\Component\Validator\Context\ExecutionContextInterface;
|
||||||
use Symfony\Component\Validator\Exception\ConstraintDefinitionException;
|
|
||||||
use Symfony\Component\Validator\Exception\NoSuchMetadataException;
|
use Symfony\Component\Validator\Exception\NoSuchMetadataException;
|
||||||
use Symfony\Component\Validator\Mapping\CascadingStrategy;
|
use Symfony\Component\Validator\Mapping\CascadingStrategy;
|
||||||
use Symfony\Component\Validator\Mapping\ClassMetadataInterface;
|
use Symfony\Component\Validator\Mapping\ClassMetadataInterface;
|
||||||
use Symfony\Component\Validator\Mapping\CollectionMetadata;
|
|
||||||
use Symfony\Component\Validator\Mapping\TraversalStrategy;
|
use Symfony\Component\Validator\Mapping\TraversalStrategy;
|
||||||
use Symfony\Component\Validator\MetadataFactoryInterface;
|
use Symfony\Component\Validator\MetadataFactoryInterface;
|
||||||
use Symfony\Component\Validator\Node\ClassNode;
|
use Symfony\Component\Validator\Node\ClassNode;
|
||||||
@ -132,7 +130,7 @@ class NodeTraverser implements NodeTraverserInterface
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// The "cascadedGroups" property is set by the NodeValidatorVisitor when
|
// The "cascadedGroups" property is set by the NodeValidationVisitor when
|
||||||
// traversing group sequences
|
// traversing group sequences
|
||||||
$cascadedGroups = null !== $node->cascadedGroups
|
$cascadedGroups = null !== $node->cascadedGroups
|
||||||
? $node->cascadedGroups
|
? $node->cascadedGroups
|
||||||
|
@ -22,13 +22,13 @@ use Symfony\Component\Validator\Node\Node;
|
|||||||
* @since 2.5
|
* @since 2.5
|
||||||
* @author Bernhard Schussek <bschussek@gmail.com>
|
* @author Bernhard Schussek <bschussek@gmail.com>
|
||||||
*/
|
*/
|
||||||
class ContextRefresherVisitor extends AbstractVisitor
|
class ContextUpdateVisitor extends AbstractVisitor
|
||||||
{
|
{
|
||||||
public function visit(Node $node, ExecutionContextInterface $context)
|
public function visit(Node $node, ExecutionContextInterface $context)
|
||||||
{
|
{
|
||||||
if (!$context instanceof NodeObserverInterface) {
|
if (!$context instanceof NodeObserverInterface) {
|
||||||
throw new RuntimeException(sprintf(
|
throw new RuntimeException(sprintf(
|
||||||
'The ContextRefresherVisitor only supports instances of class '.
|
'The ContextUpdateVisitor only supports instances of class '.
|
||||||
'"Symfony\Component\Validator\NodeVisitor\NodeObserverInterface". '.
|
'"Symfony\Component\Validator\NodeVisitor\NodeObserverInterface". '.
|
||||||
'An instance of class "%s" was given.',
|
'An instance of class "%s" was given.',
|
||||||
get_class($context)
|
get_class($context)
|
@ -21,7 +21,7 @@ use Symfony\Component\Validator\Node\Node;
|
|||||||
* @since %%NextVersion%%
|
* @since %%NextVersion%%
|
||||||
* @author Bernhard Schussek <bschussek@gmail.com>
|
* @author Bernhard Schussek <bschussek@gmail.com>
|
||||||
*/
|
*/
|
||||||
class GroupSequenceResolverVisitor extends AbstractVisitor
|
class GroupSequenceResolvingVisitor extends AbstractVisitor
|
||||||
{
|
{
|
||||||
public function visit(Node $node, ExecutionContextInterface $context)
|
public function visit(Node $node, ExecutionContextInterface $context)
|
||||||
{
|
{
|
@ -25,7 +25,7 @@ use Symfony\Component\Validator\NodeTraverser\NodeTraverserInterface;
|
|||||||
* @since %%NextVersion%%
|
* @since %%NextVersion%%
|
||||||
* @author Bernhard Schussek <bschussek@gmail.com>
|
* @author Bernhard Schussek <bschussek@gmail.com>
|
||||||
*/
|
*/
|
||||||
class NodeValidatorVisitor extends AbstractVisitor implements GroupManagerInterface
|
class NodeValidationVisitor extends AbstractVisitor implements GroupManagerInterface
|
||||||
{
|
{
|
||||||
private $validatedObjects = array();
|
private $validatedObjects = array();
|
||||||
|
|
@ -20,7 +20,7 @@ use Symfony\Component\Validator\ObjectInitializerInterface;
|
|||||||
* @since %%NextVersion%%
|
* @since %%NextVersion%%
|
||||||
* @author Bernhard Schussek <bschussek@gmail.com>
|
* @author Bernhard Schussek <bschussek@gmail.com>
|
||||||
*/
|
*/
|
||||||
class ObjectInitializerVisitor extends AbstractVisitor
|
class ObjectInitializationVisitor extends AbstractVisitor
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* @var ObjectInitializerInterface[]
|
* @var ObjectInitializerInterface[]
|
@ -15,9 +15,9 @@ use Symfony\Component\Validator\DefaultTranslator;
|
|||||||
use Symfony\Component\Validator\ConstraintValidatorFactory;
|
use Symfony\Component\Validator\ConstraintValidatorFactory;
|
||||||
use Symfony\Component\Validator\Context\LegacyExecutionContextFactory;
|
use Symfony\Component\Validator\Context\LegacyExecutionContextFactory;
|
||||||
use Symfony\Component\Validator\MetadataFactoryInterface;
|
use Symfony\Component\Validator\MetadataFactoryInterface;
|
||||||
use Symfony\Component\Validator\NodeVisitor\ContextRefresherVisitor;
|
use Symfony\Component\Validator\NodeVisitor\ContextUpdateVisitor;
|
||||||
use Symfony\Component\Validator\NodeVisitor\GroupSequenceResolverVisitor;
|
use Symfony\Component\Validator\NodeVisitor\GroupSequenceResolvingVisitor;
|
||||||
use Symfony\Component\Validator\NodeVisitor\NodeValidatorVisitor;
|
use Symfony\Component\Validator\NodeVisitor\NodeValidationVisitor;
|
||||||
use Symfony\Component\Validator\NodeTraverser\NodeTraverser;
|
use Symfony\Component\Validator\NodeTraverser\NodeTraverser;
|
||||||
use Symfony\Component\Validator\Validator\LegacyValidator;
|
use Symfony\Component\Validator\Validator\LegacyValidator;
|
||||||
|
|
||||||
@ -26,11 +26,11 @@ class LegacyValidator2Dot5ApiTest extends Abstract2Dot5ApiTest
|
|||||||
protected function createValidator(MetadataFactoryInterface $metadataFactory)
|
protected function createValidator(MetadataFactoryInterface $metadataFactory)
|
||||||
{
|
{
|
||||||
$nodeTraverser = new NodeTraverser($metadataFactory);
|
$nodeTraverser = new NodeTraverser($metadataFactory);
|
||||||
$nodeValidator = new NodeValidatorVisitor($nodeTraverser, new ConstraintValidatorFactory());
|
$nodeValidator = new NodeValidationVisitor($nodeTraverser, new ConstraintValidatorFactory());
|
||||||
$contextFactory = new LegacyExecutionContextFactory($nodeValidator, new DefaultTranslator());
|
$contextFactory = new LegacyExecutionContextFactory($nodeValidator, new DefaultTranslator());
|
||||||
$validator = new LegacyValidator($contextFactory, $nodeTraverser, $metadataFactory);
|
$validator = new LegacyValidator($contextFactory, $nodeTraverser, $metadataFactory);
|
||||||
$groupSequenceResolver = new GroupSequenceResolverVisitor();
|
$groupSequenceResolver = new GroupSequenceResolvingVisitor();
|
||||||
$contextRefresher = new ContextRefresherVisitor();
|
$contextRefresher = new ContextUpdateVisitor();
|
||||||
|
|
||||||
$nodeTraverser->addVisitor($groupSequenceResolver);
|
$nodeTraverser->addVisitor($groupSequenceResolver);
|
||||||
$nodeTraverser->addVisitor($contextRefresher);
|
$nodeTraverser->addVisitor($contextRefresher);
|
||||||
|
@ -15,9 +15,9 @@ use Symfony\Component\Validator\DefaultTranslator;
|
|||||||
use Symfony\Component\Validator\ConstraintValidatorFactory;
|
use Symfony\Component\Validator\ConstraintValidatorFactory;
|
||||||
use Symfony\Component\Validator\Context\LegacyExecutionContextFactory;
|
use Symfony\Component\Validator\Context\LegacyExecutionContextFactory;
|
||||||
use Symfony\Component\Validator\MetadataFactoryInterface;
|
use Symfony\Component\Validator\MetadataFactoryInterface;
|
||||||
use Symfony\Component\Validator\NodeVisitor\ContextRefresherVisitor;
|
use Symfony\Component\Validator\NodeVisitor\ContextUpdateVisitor;
|
||||||
use Symfony\Component\Validator\NodeVisitor\GroupSequenceResolverVisitor;
|
use Symfony\Component\Validator\NodeVisitor\GroupSequenceResolvingVisitor;
|
||||||
use Symfony\Component\Validator\NodeVisitor\NodeValidatorVisitor;
|
use Symfony\Component\Validator\NodeVisitor\NodeValidationVisitor;
|
||||||
use Symfony\Component\Validator\NodeTraverser\NodeTraverser;
|
use Symfony\Component\Validator\NodeTraverser\NodeTraverser;
|
||||||
use Symfony\Component\Validator\Validator\LegacyValidator;
|
use Symfony\Component\Validator\Validator\LegacyValidator;
|
||||||
|
|
||||||
@ -26,11 +26,11 @@ class LegacyValidatorLegacyApiTest extends AbstractLegacyApiTest
|
|||||||
protected function createValidator(MetadataFactoryInterface $metadataFactory)
|
protected function createValidator(MetadataFactoryInterface $metadataFactory)
|
||||||
{
|
{
|
||||||
$nodeTraverser = new NodeTraverser($metadataFactory);
|
$nodeTraverser = new NodeTraverser($metadataFactory);
|
||||||
$nodeValidator = new NodeValidatorVisitor($nodeTraverser, new ConstraintValidatorFactory());
|
$nodeValidator = new NodeValidationVisitor($nodeTraverser, new ConstraintValidatorFactory());
|
||||||
$contextFactory = new LegacyExecutionContextFactory($nodeValidator, new DefaultTranslator());
|
$contextFactory = new LegacyExecutionContextFactory($nodeValidator, new DefaultTranslator());
|
||||||
$validator = new LegacyValidator($contextFactory, $nodeTraverser, $metadataFactory);
|
$validator = new LegacyValidator($contextFactory, $nodeTraverser, $metadataFactory);
|
||||||
$groupSequenceResolver = new GroupSequenceResolverVisitor();
|
$groupSequenceResolver = new GroupSequenceResolvingVisitor();
|
||||||
$contextRefresher = new ContextRefresherVisitor();
|
$contextRefresher = new ContextUpdateVisitor();
|
||||||
|
|
||||||
$nodeTraverser->addVisitor($groupSequenceResolver);
|
$nodeTraverser->addVisitor($groupSequenceResolver);
|
||||||
$nodeTraverser->addVisitor($contextRefresher);
|
$nodeTraverser->addVisitor($contextRefresher);
|
||||||
|
@ -15,9 +15,9 @@ use Symfony\Component\Validator\DefaultTranslator;
|
|||||||
use Symfony\Component\Validator\ConstraintValidatorFactory;
|
use Symfony\Component\Validator\ConstraintValidatorFactory;
|
||||||
use Symfony\Component\Validator\Context\ExecutionContextFactory;
|
use Symfony\Component\Validator\Context\ExecutionContextFactory;
|
||||||
use Symfony\Component\Validator\MetadataFactoryInterface;
|
use Symfony\Component\Validator\MetadataFactoryInterface;
|
||||||
use Symfony\Component\Validator\NodeVisitor\ContextRefresherVisitor;
|
use Symfony\Component\Validator\NodeVisitor\ContextUpdateVisitor;
|
||||||
use Symfony\Component\Validator\NodeVisitor\GroupSequenceResolverVisitor;
|
use Symfony\Component\Validator\NodeVisitor\GroupSequenceResolvingVisitor;
|
||||||
use Symfony\Component\Validator\NodeVisitor\NodeValidatorVisitor;
|
use Symfony\Component\Validator\NodeVisitor\NodeValidationVisitor;
|
||||||
use Symfony\Component\Validator\NodeTraverser\NodeTraverser;
|
use Symfony\Component\Validator\NodeTraverser\NodeTraverser;
|
||||||
use Symfony\Component\Validator\Validator\Validator;
|
use Symfony\Component\Validator\Validator\Validator;
|
||||||
|
|
||||||
@ -26,11 +26,11 @@ class Validator2Dot5ApiTest extends Abstract2Dot5ApiTest
|
|||||||
protected function createValidator(MetadataFactoryInterface $metadataFactory)
|
protected function createValidator(MetadataFactoryInterface $metadataFactory)
|
||||||
{
|
{
|
||||||
$nodeTraverser = new NodeTraverser($metadataFactory);
|
$nodeTraverser = new NodeTraverser($metadataFactory);
|
||||||
$nodeValidator = new NodeValidatorVisitor($nodeTraverser, new ConstraintValidatorFactory());
|
$nodeValidator = new NodeValidationVisitor($nodeTraverser, new ConstraintValidatorFactory());
|
||||||
$contextFactory = new ExecutionContextFactory($nodeValidator, new DefaultTranslator());
|
$contextFactory = new ExecutionContextFactory($nodeValidator, new DefaultTranslator());
|
||||||
$validator = new Validator($contextFactory, $nodeTraverser, $metadataFactory);
|
$validator = new Validator($contextFactory, $nodeTraverser, $metadataFactory);
|
||||||
$groupSequenceResolver = new GroupSequenceResolverVisitor();
|
$groupSequenceResolver = new GroupSequenceResolvingVisitor();
|
||||||
$contextRefresher = new ContextRefresherVisitor();
|
$contextRefresher = new ContextUpdateVisitor();
|
||||||
|
|
||||||
$nodeTraverser->addVisitor($groupSequenceResolver);
|
$nodeTraverser->addVisitor($groupSequenceResolver);
|
||||||
$nodeTraverser->addVisitor($contextRefresher);
|
$nodeTraverser->addVisitor($contextRefresher);
|
||||||
|
Reference in New Issue
Block a user