Skip to content

Commit

Permalink
[Validator] renamed method to follow CS
Browse files Browse the repository at this point in the history
  • Loading branch information
fabpot committed Mar 30, 2011
1 parent 6cd77f7 commit 525702b
Show file tree
Hide file tree
Showing 5 changed files with 36 additions and 36 deletions.
4 changes: 2 additions & 2 deletions src/Symfony/Component/Validator/ValidatorContext.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class ValidatorContext implements ValidatorContextInterface
/**
* @inheritDoc
*/
public function classMetadataFactory(ClassMetadataFactoryInterface $classMetadataFactory)
public function setClassMetadataFactory(ClassMetadataFactoryInterface $classMetadataFactory)
{
$this->classMetadataFactory = $classMetadataFactory;

Expand All @@ -45,7 +45,7 @@ public function classMetadataFactory(ClassMetadataFactoryInterface $classMetadat
/**
* @inheritDoc
*/
public function constraintValidatorFactory(ConstraintValidatorFactoryInterface $constraintValidatorFactory)
public function setConstraintValidatorFactory(ConstraintValidatorFactoryInterface $constraintValidatorFactory)
{
$this->constraintValidatorFactory = $constraintValidatorFactory;

Expand Down
6 changes: 3 additions & 3 deletions src/Symfony/Component/Validator/ValidatorContextInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
*
* <code>
* $validator = $context
* ->classMetadataFactory($customFactory)
* ->setClassMetadataFactory($customFactory)
* ->getValidator();
* </code>
*
Expand All @@ -35,14 +35,14 @@ interface ValidatorContextInterface
*
* @param ClassMetadataFactoryInterface $classMetadataFactory The factory instance
*/
function classMetadataFactory(ClassMetadataFactoryInterface $classMetadataFactory);
function setClassMetadataFactory(ClassMetadataFactoryInterface $classMetadataFactory);

/**
* Sets the constraint validator factory used in the new validator
*
* @param ConstraintValidatorFactoryInterface $constraintValidatorFactory The factory instance
*/
function constraintValidatorFactory(ConstraintValidatorFactoryInterface $constraintValidatorFactory);
function setConstraintValidatorFactory(ConstraintValidatorFactoryInterface $constraintValidatorFactory);

/**
* Creates a new validator with the settings stored in this context
Expand Down
18 changes: 9 additions & 9 deletions src/Symfony/Component/Validator/ValidatorFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@
*
* <code>
* $defaultContext = new ValidatorContext();
* $defaultContext->classMetadataFactory($metadataFactory);
* $defaultContext->constraintValidatorFactory($validatorFactory);
* $defaultContext->setClassMetadataFactory($metadataFactory);
* $defaultContext->setConstraintValidatorFactory($validatorFactory);
* $factory = new ValidatorFactory($defaultContext);
*
* $form = $factory->getValidator();
Expand All @@ -65,7 +65,7 @@
*
* <code>
* $form = $factory
* ->classMetadataFactory($customFactory);
* ->setClassMetadataFactory($customFactory);
* ->getValidator();
* </code>
*
Expand Down Expand Up @@ -143,8 +143,8 @@ public static function buildDefault(array $mappingFiles = array(), $annotations
throw new MappingException('No mapping loader was found for the given parameters');
}

$context->classMetadataFactory(new ClassMetadataFactory($loader));
$context->constraintValidatorFactory(new ConstraintValidatorFactory());
$context->setClassMetadataFactory(new ClassMetadataFactory($loader));
$context->setConstraintValidatorFactory(new ConstraintValidatorFactory());

return new static($context);
}
Expand All @@ -166,11 +166,11 @@ public function __construct(ValidatorContextInterface $defaultContext = null)
* @param ClassMetadataFactoryInterface $metadataFactory The new factory instance
* @return ValidatorContextInterface The preconfigured form context
*/
public function classMetadataFactory(ClassMetadataFactoryInterface $metadataFactory)
public function setClassMetadataFactory(ClassMetadataFactoryInterface $metadataFactory)
{
$context = clone $this->defaultContext;

return $context->classMetadataFactory($metadataFactory);
return $context->setClassMetadataFactory($metadataFactory);
}

/**
Expand All @@ -180,11 +180,11 @@ public function classMetadataFactory(ClassMetadataFactoryInterface $metadataFact
* @param ClassMetadataFactoryInterface $validatorFactory The new factory instance
* @return ValidatorContextInterface The preconfigured form context
*/
public function constraintValidatorFactory(ConstraintValidatorFactoryInterface $validatorFactory)
public function setConstraintValidatorFactory(ConstraintValidatorFactoryInterface $validatorFactory)
{
$context = clone $this->defaultContext;

return $context->constraintValidatorFactory($validatorFactory);
return $context->setConstraintValidatorFactory($validatorFactory);
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ protected function setUp()
public function testSetClassMetadataFactory()
{
$factory = $this->getMock('Symfony\Component\Validator\Mapping\ClassMetadataFactoryInterface');
$result = $this->context->classMetadataFactory($factory);
$result = $this->context->setClassMetadataFactory($factory);

$this->assertSame($this->context, $result);
$this->assertSame($factory, $this->context->getClassMetadataFactory());
Expand All @@ -35,7 +35,7 @@ public function testSetClassMetadataFactory()
public function testSetConstraintValidatorFactory()
{
$factory = $this->getMock('Symfony\Component\Validator\ConstraintValidatorFactoryInterface');
$result = $this->context->constraintValidatorFactory($factory);
$result = $this->context->setConstraintValidatorFactory($factory);

$this->assertSame($this->context, $result);
$this->assertSame($factory, $this->context->getConstraintValidatorFactory());
Expand All @@ -47,8 +47,8 @@ public function testGetValidator()
$validatorFactory = $this->getMock('Symfony\Component\Validator\ConstraintValidatorFactoryInterface');

$validator = $this->context
->classMetadataFactory($metadataFactory)
->constraintValidatorFactory($validatorFactory)
->setClassMetadataFactory($metadataFactory)
->setConstraintValidatorFactory($validatorFactory)
->getValidator();

$this->assertEquals(new Validator($metadataFactory, $validatorFactory), $validator);
Expand Down
36 changes: 18 additions & 18 deletions tests/Symfony/Tests/Component/Validator/ValidatorFactoryTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ public function testOverrideClassMetadataFactory()
$factory1 = $this->getMock('Symfony\Component\Validator\Mapping\ClassMetadataFactoryInterface');
$factory2 = $this->getMock('Symfony\Component\Validator\Mapping\ClassMetadataFactoryInterface');

$this->defaultContext->classMetadataFactory($factory1);
$this->defaultContext->setClassMetadataFactory($factory1);

$result = $this->factory->classMetadataFactory($factory2);
$result = $this->factory->setClassMetadataFactory($factory2);

$this->assertSame($factory1, $this->defaultContext->getClassMetadataFactory());
$this->assertSame($factory2, $result->getClassMetadataFactory());
Expand All @@ -51,9 +51,9 @@ public function testOverrideConstraintValidatorFactory()
$factory1 = $this->getMock('Symfony\Component\Validator\ConstraintValidatorFactoryInterface');
$factory2 = $this->getMock('Symfony\Component\Validator\ConstraintValidatorFactoryInterface');

$this->defaultContext->constraintValidatorFactory($factory1);
$this->defaultContext->setConstraintValidatorFactory($factory1);

$result = $this->factory->constraintValidatorFactory($factory2);
$result = $this->factory->setConstraintValidatorFactory($factory2);

$this->assertSame($factory1, $this->defaultContext->getConstraintValidatorFactory());
$this->assertSame($factory2, $result->getConstraintValidatorFactory());
Expand All @@ -65,8 +65,8 @@ public function testGetValidator()
$validatorFactory = $this->getMock('Symfony\Component\Validator\ConstraintValidatorFactoryInterface');

$this->defaultContext
->classMetadataFactory($metadataFactory)
->constraintValidatorFactory($validatorFactory);
->setClassMetadataFactory($metadataFactory)
->setConstraintValidatorFactory($validatorFactory);

$validator = $this->factory->getValidator();

Expand All @@ -82,8 +82,8 @@ public function testBuildDefaultFromAnnotations()

$context = new ValidatorContext();
$context
->classMetadataFactory(new ClassMetadataFactory(new AnnotationLoader()))
->constraintValidatorFactory(new ConstraintValidatorFactory());
->setClassMetadataFactory(new ClassMetadataFactory(new AnnotationLoader()))
->setConstraintValidatorFactory(new ConstraintValidatorFactory());

$this->assertEquals(new ValidatorFactory($context), $factory);
}
Expand All @@ -99,10 +99,10 @@ public function testBuildDefaultFromAnnotationsWithCustomNamespaces()

$context = new ValidatorContext();
$context
->classMetadataFactory(new ClassMetadataFactory(new AnnotationLoader(array(
->setClassMetadataFactory(new ClassMetadataFactory(new AnnotationLoader(array(
'myns' => 'My\\Namespace\\',
))))
->constraintValidatorFactory(new ConstraintValidatorFactory());
->setConstraintValidatorFactory(new ConstraintValidatorFactory());

$this->assertEquals(new ValidatorFactory($context), $factory);
}
Expand All @@ -114,8 +114,8 @@ public function testBuildDefaultFromXml()

$context = new ValidatorContext();
$context
->classMetadataFactory(new ClassMetadataFactory(new XmlFilesLoader(array($path))))
->constraintValidatorFactory(new ConstraintValidatorFactory());
->setClassMetadataFactory(new ClassMetadataFactory(new XmlFilesLoader(array($path))))
->setConstraintValidatorFactory(new ConstraintValidatorFactory());

$this->assertEquals(new ValidatorFactory($context), $factory);
}
Expand All @@ -127,8 +127,8 @@ public function testBuildDefaultFromYaml()

$context = new ValidatorContext();
$context
->classMetadataFactory(new ClassMetadataFactory(new YamlFilesLoader(array($path))))
->constraintValidatorFactory(new ConstraintValidatorFactory());
->setClassMetadataFactory(new ClassMetadataFactory(new YamlFilesLoader(array($path))))
->setConstraintValidatorFactory(new ConstraintValidatorFactory());

$this->assertEquals(new ValidatorFactory($context), $factory);
}
Expand All @@ -140,8 +140,8 @@ public function testBuildDefaultFromStaticMethod()

$context = new ValidatorContext();
$context
->classMetadataFactory(new ClassMetadataFactory(new StaticMethodLoader('loadMetadata')))
->constraintValidatorFactory(new ConstraintValidatorFactory());
->setClassMetadataFactory(new ClassMetadataFactory(new StaticMethodLoader('loadMetadata')))
->setConstraintValidatorFactory(new ConstraintValidatorFactory());

$this->assertEquals(new ValidatorFactory($context), $factory);
}
Expand All @@ -164,8 +164,8 @@ public function testBuildDefaultFromMultipleLoaders()

$context = new ValidatorContext();
$context
->classMetadataFactory(new ClassMetadataFactory($chain))
->constraintValidatorFactory(new ConstraintValidatorFactory());
->setClassMetadataFactory(new ClassMetadataFactory($chain))
->setConstraintValidatorFactory(new ConstraintValidatorFactory());

$this->assertEquals(new ValidatorFactory($context), $factory);
}
Expand Down

0 comments on commit 525702b

Please sign in to comment.