Переглянути джерело

Merge remote branch 'stloyd/regexp_validator'

* stloyd/regexp_validator:
  Simplify RegexValidator
Fabien Potencier 14 роки тому
батько
коміт
9f76d3452d

+ 7 - 5
src/Symfony/Component/Validator/Constraints/RegexValidator.php

@@ -15,6 +15,12 @@ use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
 use Symfony\Component\Validator\Exception\UnexpectedTypeException;
 
+/**
+ * Validates whether a value match or not given regexp pattern
+ *
+ * @author Bernhard Schussek <bernhard.schussek@symfony.com>
+ * @author Joseph Bielawski <stloyd@gmail.com>
+ */
 class RegexValidator extends ConstraintValidator
 {
     public function isValid($value, Constraint $constraint)
@@ -29,11 +35,7 @@ class RegexValidator extends ConstraintValidator
 
         $value = (string) $value;
 
-        if (
-            ($constraint->match && !preg_match($constraint->pattern, $value))
-            ||
-            (!$constraint->match && preg_match($constraint->pattern, $value))
-        ) {
+        if ($constraint->match XOR preg_match($constraint->pattern, $value)) {
             $this->setMessage($constraint->message, array('{{ value }}' => $value));
 
             return false;