From cf1281feefd59560c77bbb17cb980f20c4bb8161 Mon Sep 17 00:00:00 2001 From: Bernhard Schussek Date: Thu, 20 Feb 2014 11:36:21 +0100 Subject: [PATCH] [Validator] Added "Visitor" suffix to all node visitors --- .../Validator/NodeTraverser/NodeTraverser.php | 2 +- ...textRefresher.php => ContextRefresherVisitor.php} | 6 +++--- ...Resolver.php => GroupSequenceResolverVisitor.php} | 2 +- .../{NodeValidator.php => NodeValidatorVisitor.php} | 2 +- ...tInitializer.php => ObjectInitializerVisitor.php} | 2 +- .../Tests/Validator/LegacyValidator2Dot5ApiTest.php | 12 ++++++------ .../Tests/Validator/LegacyValidatorLegacyApiTest.php | 12 ++++++------ .../Tests/Validator/Validator2Dot5ApiTest.php | 12 ++++++------ 8 files changed, 25 insertions(+), 25 deletions(-) rename src/Symfony/Component/Validator/NodeVisitor/{ContextRefresher.php => ContextRefresherVisitor.php} (87%) rename src/Symfony/Component/Validator/NodeVisitor/{GroupSequenceResolver.php => GroupSequenceResolverVisitor.php} (96%) rename src/Symfony/Component/Validator/NodeVisitor/{NodeValidator.php => NodeValidatorVisitor.php} (98%) rename src/Symfony/Component/Validator/NodeVisitor/{ObjectInitializer.php => ObjectInitializerVisitor.php} (96%) diff --git a/src/Symfony/Component/Validator/NodeTraverser/NodeTraverser.php b/src/Symfony/Component/Validator/NodeTraverser/NodeTraverser.php index 9d6f4d6394..fa4433564d 100644 --- a/src/Symfony/Component/Validator/NodeTraverser/NodeTraverser.php +++ b/src/Symfony/Component/Validator/NodeTraverser/NodeTraverser.php @@ -137,7 +137,7 @@ class NodeTraverser implements NodeTraverserInterface return; } - // The "cascadedGroups" property is set by the NodeValidator when + // The "cascadedGroups" property is set by the NodeValidatorVisitor when // traversing group sequences $cascadedGroups = null !== $node->cascadedGroups ? $node->cascadedGroups diff --git a/src/Symfony/Component/Validator/NodeVisitor/ContextRefresher.php b/src/Symfony/Component/Validator/NodeVisitor/ContextRefresherVisitor.php similarity index 87% rename from src/Symfony/Component/Validator/NodeVisitor/ContextRefresher.php rename to src/Symfony/Component/Validator/NodeVisitor/ContextRefresherVisitor.php index 3166d38285..3b940043a6 100644 --- a/src/Symfony/Component/Validator/NodeVisitor/ContextRefresher.php +++ b/src/Symfony/Component/Validator/NodeVisitor/ContextRefresherVisitor.php @@ -23,13 +23,13 @@ use Symfony\Component\Validator\Util\NodeStackInterface; * @since 2.5 * @author Bernhard Schussek */ -class ContextRefresher extends AbstractVisitor +class ContextRefresherVisitor extends AbstractVisitor { public function enterNode(Node $node, ExecutionContextInterface $context) { if (!$context instanceof NodeStackInterface) { throw new RuntimeException(sprintf( - 'The ContextRefresher only supports instances of class '. + 'The ContextRefresherVisitor only supports instances of class '. '"Symfony\Component\Validator\Context\NodeStackInterface". '. 'An instance of class "%s" was given.', get_class($context) @@ -43,7 +43,7 @@ class ContextRefresher extends AbstractVisitor { if (!$context instanceof NodeStackInterface) { throw new RuntimeException(sprintf( - 'The ContextRefresher only supports instances of class '. + 'The ContextRefresherVisitor only supports instances of class '. '"Symfony\Component\Validator\Context\NodeStackInterface". '. 'An instance of class "%s" was given.', get_class($context) diff --git a/src/Symfony/Component/Validator/NodeVisitor/GroupSequenceResolver.php b/src/Symfony/Component/Validator/NodeVisitor/GroupSequenceResolverVisitor.php similarity index 96% rename from src/Symfony/Component/Validator/NodeVisitor/GroupSequenceResolver.php rename to src/Symfony/Component/Validator/NodeVisitor/GroupSequenceResolverVisitor.php index b5887ba4b0..c03f7a64c3 100644 --- a/src/Symfony/Component/Validator/NodeVisitor/GroupSequenceResolver.php +++ b/src/Symfony/Component/Validator/NodeVisitor/GroupSequenceResolverVisitor.php @@ -21,7 +21,7 @@ use Symfony\Component\Validator\Node\Node; * @since %%NextVersion%% * @author Bernhard Schussek */ -class GroupSequenceResolver extends AbstractVisitor +class GroupSequenceResolverVisitor extends AbstractVisitor { public function enterNode(Node $node, ExecutionContextInterface $context) { diff --git a/src/Symfony/Component/Validator/NodeVisitor/NodeValidator.php b/src/Symfony/Component/Validator/NodeVisitor/NodeValidatorVisitor.php similarity index 98% rename from src/Symfony/Component/Validator/NodeVisitor/NodeValidator.php rename to src/Symfony/Component/Validator/NodeVisitor/NodeValidatorVisitor.php index e410cb259e..6261791070 100644 --- a/src/Symfony/Component/Validator/NodeVisitor/NodeValidator.php +++ b/src/Symfony/Component/Validator/NodeVisitor/NodeValidatorVisitor.php @@ -24,7 +24,7 @@ use Symfony\Component\Validator\NodeTraverser\NodeTraverserInterface; * @since %%NextVersion%% * @author Bernhard Schussek */ -class NodeValidator extends AbstractVisitor implements GroupManagerInterface +class NodeValidatorVisitor extends AbstractVisitor implements GroupManagerInterface { private $validatedObjects = array(); diff --git a/src/Symfony/Component/Validator/NodeVisitor/ObjectInitializer.php b/src/Symfony/Component/Validator/NodeVisitor/ObjectInitializerVisitor.php similarity index 96% rename from src/Symfony/Component/Validator/NodeVisitor/ObjectInitializer.php rename to src/Symfony/Component/Validator/NodeVisitor/ObjectInitializerVisitor.php index 8d44d39ee0..1bef7f3189 100644 --- a/src/Symfony/Component/Validator/NodeVisitor/ObjectInitializer.php +++ b/src/Symfony/Component/Validator/NodeVisitor/ObjectInitializerVisitor.php @@ -20,7 +20,7 @@ use Symfony\Component\Validator\ObjectInitializerInterface; * @since %%NextVersion%% * @author Bernhard Schussek */ -class ObjectInitializer extends AbstractVisitor +class ObjectInitializerVisitor extends AbstractVisitor { /** * @var ObjectInitializerInterface[] diff --git a/src/Symfony/Component/Validator/Tests/Validator/LegacyValidator2Dot5ApiTest.php b/src/Symfony/Component/Validator/Tests/Validator/LegacyValidator2Dot5ApiTest.php index 1cecafdedf..600a297947 100644 --- a/src/Symfony/Component/Validator/Tests/Validator/LegacyValidator2Dot5ApiTest.php +++ b/src/Symfony/Component/Validator/Tests/Validator/LegacyValidator2Dot5ApiTest.php @@ -15,9 +15,9 @@ use Symfony\Component\Validator\DefaultTranslator; use Symfony\Component\Validator\ConstraintValidatorFactory; use Symfony\Component\Validator\Context\LegacyExecutionContextFactory; use Symfony\Component\Validator\MetadataFactoryInterface; -use Symfony\Component\Validator\NodeVisitor\ContextRefresher; -use Symfony\Component\Validator\NodeVisitor\GroupSequenceResolver; -use Symfony\Component\Validator\NodeVisitor\NodeValidator; +use Symfony\Component\Validator\NodeVisitor\ContextRefresherVisitor; +use Symfony\Component\Validator\NodeVisitor\GroupSequenceResolverVisitor; +use Symfony\Component\Validator\NodeVisitor\NodeValidatorVisitor; use Symfony\Component\Validator\NodeTraverser\NodeTraverser; use Symfony\Component\Validator\Validator\LegacyValidator; @@ -26,11 +26,11 @@ class LegacyValidator2Dot5ApiTest extends Abstract2Dot5ApiTest protected function createValidator(MetadataFactoryInterface $metadataFactory) { $nodeTraverser = new NodeTraverser($metadataFactory); - $nodeValidator = new NodeValidator($nodeTraverser, new ConstraintValidatorFactory()); + $nodeValidator = new NodeValidatorVisitor($nodeTraverser, new ConstraintValidatorFactory()); $contextFactory = new LegacyExecutionContextFactory($nodeValidator, new DefaultTranslator()); $validator = new LegacyValidator($contextFactory, $nodeTraverser, $metadataFactory); - $groupSequenceResolver = new GroupSequenceResolver(); - $contextRefresher = new ContextRefresher(); + $groupSequenceResolver = new GroupSequenceResolverVisitor(); + $contextRefresher = new ContextRefresherVisitor(); $nodeTraverser->addVisitor($groupSequenceResolver); $nodeTraverser->addVisitor($contextRefresher); diff --git a/src/Symfony/Component/Validator/Tests/Validator/LegacyValidatorLegacyApiTest.php b/src/Symfony/Component/Validator/Tests/Validator/LegacyValidatorLegacyApiTest.php index 94900e4497..fc2fe0bb38 100644 --- a/src/Symfony/Component/Validator/Tests/Validator/LegacyValidatorLegacyApiTest.php +++ b/src/Symfony/Component/Validator/Tests/Validator/LegacyValidatorLegacyApiTest.php @@ -15,9 +15,9 @@ use Symfony\Component\Validator\DefaultTranslator; use Symfony\Component\Validator\ConstraintValidatorFactory; use Symfony\Component\Validator\Context\LegacyExecutionContextFactory; use Symfony\Component\Validator\MetadataFactoryInterface; -use Symfony\Component\Validator\NodeVisitor\ContextRefresher; -use Symfony\Component\Validator\NodeVisitor\GroupSequenceResolver; -use Symfony\Component\Validator\NodeVisitor\NodeValidator; +use Symfony\Component\Validator\NodeVisitor\ContextRefresherVisitor; +use Symfony\Component\Validator\NodeVisitor\GroupSequenceResolverVisitor; +use Symfony\Component\Validator\NodeVisitor\NodeValidatorVisitor; use Symfony\Component\Validator\NodeTraverser\NodeTraverser; use Symfony\Component\Validator\Validator\LegacyValidator; @@ -26,11 +26,11 @@ class LegacyValidatorLegacyApiTest extends AbstractLegacyApiTest protected function createValidator(MetadataFactoryInterface $metadataFactory) { $nodeTraverser = new NodeTraverser($metadataFactory); - $nodeValidator = new NodeValidator($nodeTraverser, new ConstraintValidatorFactory()); + $nodeValidator = new NodeValidatorVisitor($nodeTraverser, new ConstraintValidatorFactory()); $contextFactory = new LegacyExecutionContextFactory($nodeValidator, new DefaultTranslator()); $validator = new LegacyValidator($contextFactory, $nodeTraverser, $metadataFactory); - $groupSequenceResolver = new GroupSequenceResolver(); - $contextRefresher = new ContextRefresher(); + $groupSequenceResolver = new GroupSequenceResolverVisitor(); + $contextRefresher = new ContextRefresherVisitor(); $nodeTraverser->addVisitor($groupSequenceResolver); $nodeTraverser->addVisitor($contextRefresher); diff --git a/src/Symfony/Component/Validator/Tests/Validator/Validator2Dot5ApiTest.php b/src/Symfony/Component/Validator/Tests/Validator/Validator2Dot5ApiTest.php index 4d58f0a13e..e3f92b8799 100644 --- a/src/Symfony/Component/Validator/Tests/Validator/Validator2Dot5ApiTest.php +++ b/src/Symfony/Component/Validator/Tests/Validator/Validator2Dot5ApiTest.php @@ -15,9 +15,9 @@ use Symfony\Component\Validator\DefaultTranslator; use Symfony\Component\Validator\ConstraintValidatorFactory; use Symfony\Component\Validator\Context\ExecutionContextFactory; use Symfony\Component\Validator\MetadataFactoryInterface; -use Symfony\Component\Validator\NodeVisitor\ContextRefresher; -use Symfony\Component\Validator\NodeVisitor\GroupSequenceResolver; -use Symfony\Component\Validator\NodeVisitor\NodeValidator; +use Symfony\Component\Validator\NodeVisitor\ContextRefresherVisitor; +use Symfony\Component\Validator\NodeVisitor\GroupSequenceResolverVisitor; +use Symfony\Component\Validator\NodeVisitor\NodeValidatorVisitor; use Symfony\Component\Validator\NodeTraverser\NodeTraverser; use Symfony\Component\Validator\Validator\Validator; @@ -26,11 +26,11 @@ class Validator2Dot5ApiTest extends Abstract2Dot5ApiTest protected function createValidator(MetadataFactoryInterface $metadataFactory) { $nodeTraverser = new NodeTraverser($metadataFactory); - $nodeValidator = new NodeValidator($nodeTraverser, new ConstraintValidatorFactory()); + $nodeValidator = new NodeValidatorVisitor($nodeTraverser, new ConstraintValidatorFactory()); $contextFactory = new ExecutionContextFactory($nodeValidator, new DefaultTranslator()); $validator = new Validator($contextFactory, $nodeTraverser, $metadataFactory); - $groupSequenceResolver = new GroupSequenceResolver(); - $contextRefresher = new ContextRefresher(); + $groupSequenceResolver = new GroupSequenceResolverVisitor(); + $contextRefresher = new ContextRefresherVisitor(); $nodeTraverser->addVisitor($groupSequenceResolver); $nodeTraverser->addVisitor($contextRefresher);