diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Validator] Renamed @Validation constraint to @Set

Browse Source
This commit is contained in:
Bernhard Schussek 2011-01-02 19:19:15 +01:00 committed by Fabien Potencier
parent ba422e8472
commit 708c780213
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Component/Validator/Constraints/Validation.php → src/Symfony/Component/Validator/Constraints/Set.php
View File

@ -11,7 +11,7 @@ namespace Symfony\Component\Validator\Constraints;
* with this source code in the file LICENSE.
*/
class Validation
class Set
{
public $constraints;

8
src/Symfony/Component/Validator/Mapping/Loader/AnnotationLoader.php
View File

@ -14,7 +14,7 @@ namespace Symfony\Component\Validator\Mapping\Loader;
use Symfony\Component\Validator\Exception\MappingException;
use Symfony\Component\Validator\Mapping\ClassMetadata;
use Doctrine\Common\Annotations\AnnotationReader;
use Symfony\Component\Validator\Constraints\Validation;
use Symfony\Component\Validator\Constraints\Set;
use Symfony\Component\Validator\Constraints\GroupSequence;
use Symfony\Component\Validator\Constraint;
@ -46,7 +46,7 @@ class AnnotationLoader implements LoaderInterface
$loaded = false;
foreach ($this->reader->getClassAnnotations($reflClass) as $constraint) {
if ($constraint instanceof Validation) {
if ($constraint instanceof Set) {
foreach ($constraint->constraints as $constraint) {
$metadata->addConstraint($constraint);
}
@ -62,7 +62,7 @@ class AnnotationLoader implements LoaderInterface
foreach ($reflClass->getProperties() as $property) {
if ($property->getDeclaringClass()->getName() == $className) {
foreach ($this->reader->getPropertyAnnotations($property) as $constraint) {
if ($constraint instanceof Validation) {
if ($constraint instanceof Set) {
foreach ($constraint->constraints as $constraint) {
$metadata->addPropertyConstraint($property->getName(), $constraint);
}
@ -81,7 +81,7 @@ class AnnotationLoader implements LoaderInterface
// TODO: clean this up
$name = lcfirst(substr($method->getName(), 0, 3)=='get' ? substr($method->getName(), 3) : substr($method->getName(), 2));
if ($constraint instanceof Validation) {
if ($constraint instanceof Set) {
foreach ($constraint->constraints as $constraint) {
$metadata->addGetterConstraint($name, $constraint);
}

2
tests/Symfony/Tests/Component/Validator/Fixtures/Entity.php
View File

@ -10,7 +10,7 @@ require_once __DIR__.'/EntityInterface.php';
* @Symfony\Tests\Component\Validator\Fixtures\ConstraintA
* @validation:Min(3)
* @validation:Choice({"A", "B"})
* @validation:Validation({
* @validation:Set({
* @validation:All({@validation:NotNull, @validation:Min(3)}),
* @validation:All(constraints={@validation:NotNull, @validation:Min(3)})
* })