[Validator] removed the convention that error parameters are delimite…

…d with %%
symfony · Sep 29, 2010 · 3b1e833 · 3b1e833
1 parent 7ead257
commit 3b1e833
Show file tree

Hide file tree

Showing 33 changed files with 70 additions and 77 deletions.
diff --git a/src/Symfony/Component/Validator/ConstraintViolation.php b/src/Symfony/Component/Validator/ConstraintViolation.php
@@ -31,14 +31,7 @@ public function getMessageParameters()
 
     public function getMessage()
     {
-        $sources = array();
-        $targets = array();
-        foreach ($this->messageParameters as $key => $value) {
-            $sources[] = '{{ '.$key.' }}';
-            $targets[] = (string) $value;
-        }
-
-        return str_replace($sources, $targets, $this->messageTemplate);
+        return str_replace(array_keys($sources), array_values($targets), $this->messageTemplate);
     }
 
     public function getRoot()

diff --git a/src/Symfony/Component/Validator/Constraints/AssertTypeValidator.php b/src/Symfony/Component/Validator/Constraints/AssertTypeValidator.php
@@ -23,8 +23,8 @@ public function isValid($value, Constraint $constraint)
         }
 
         $this->setMessage($constraint->message, array(
-            'value' => $value,
-            'type' => $constraint->type,
+            '{{ value }}' => $value,
+            '{{ type }}'  => $constraint->type,
         ));
 
         return false;

diff --git a/src/Symfony/Component/Validator/Constraints/BlankValidator.php b/src/Symfony/Component/Validator/Constraints/BlankValidator.php
@@ -10,7 +10,7 @@ class BlankValidator extends ConstraintValidator
     public function isValid($value, Constraint $constraint)
     {
         if ($value !== '' && $value !== null) {
-            $this->setMessage($constraint->message, array('value' => $value));
+            $this->setMessage($constraint->message, array('{{ value }}' => $value));
 
             return false;
         }

diff --git a/src/Symfony/Component/Validator/Constraints/ChoiceValidator.php b/src/Symfony/Component/Validator/Constraints/ChoiceValidator.php
@@ -53,7 +53,7 @@ public function isValid($value, Constraint $constraint)
         if ($constraint->multiple) {
             foreach ($value as $_value) {
                 if (!in_array($_value, $choices, true)) {
-                    $this->setMessage($constraint->message, array('value' => $_value));
+                    $this->setMessage($constraint->message, array('{{ value }}' => $_value));
 
                     return false;
                 }
@@ -62,18 +62,18 @@ public function isValid($value, Constraint $constraint)
             $count = count($value);
 
             if ($constraint->min !== null && $count < $constraint->min) {
-                $this->setMessage($constraint->minMessage, array('limit' => $constraint->min));
+                $this->setMessage($constraint->minMessage, array('{{ limit }}' => $constraint->min));
 
                 return false;
             }
 
             if ($constraint->max !== null && $count > $constraint->max) {
-                $this->setMessage($constraint->maxMessage, array('limit' => $constraint->max));
+                $this->setMessage($constraint->maxMessage, array('{{ limit }}' => $constraint->max));
 
                 return false;
             }
         } elseif (!in_array($value, $choices, true)) {
-            $this->setMessage($constraint->message, array('value' => $value));
+            $this->setMessage($constraint->message, array('{{ value }}' => $value));
 
             return false;
         }

diff --git a/src/Symfony/Component/Validator/Constraints/CollectionValidator.php b/src/Symfony/Component/Validator/Constraints/CollectionValidator.php
@@ -48,15 +48,15 @@ public function isValid($value, Constraint $constraint)
 
         if (count($extraFields) > 0 && !$constraint->allowExtraFields) {
             $this->setMessage($constraint->extraFieldsMessage, array(
-                'fields' => '"'.implode('", "', array_keys($extraFields)).'"'
+                '{{ fields }}' => '"'.implode('", "', array_keys($extraFields)).'"'
             ));
 
             return false;
         }
 
         if (count($missingFields) > 0 && !$constraint->allowMissingFields) {
             $this->setMessage($constraint->missingFieldsMessage, array(
-                'fields' => '"'.implode('", "', $missingFields).'"'
+                '{{ fields }}' => '"'.implode('", "', $missingFields).'"'
             ));
 
             return false;

diff --git a/src/Symfony/Component/Validator/Constraints/DateTimeValidator.php b/src/Symfony/Component/Validator/Constraints/DateTimeValidator.php
@@ -27,7 +27,7 @@ public function isValid($value, Constraint $constraint)
         $value = (string)$value;
 
         if (!preg_match(self::PATTERN, $value, $matches)) {
-            $this->setMessage($constraint->message, array('value' => $value));
+            $this->setMessage($constraint->message, array('{{ value }}' => $value));
 
             return false;
         }

diff --git a/src/Symfony/Component/Validator/Constraints/DateValidator.php b/src/Symfony/Component/Validator/Constraints/DateValidator.php
@@ -23,7 +23,7 @@ public function isValid($value, Constraint $constraint)
         $value = (string)$value;
 
         if (!preg_match(self::PATTERN, $value, $matches)) {
-            $this->setMessage($constraint->message, array('value' => $value));
+            $this->setMessage($constraint->message, array('{{ value }}' => $value));
 
             return false;
         }

diff --git a/src/Symfony/Component/Validator/Constraints/EmailValidator.php b/src/Symfony/Component/Validator/Constraints/EmailValidator.php
@@ -23,7 +23,7 @@ public function isValid($value, Constraint $constraint)
         $value = (string)$value;
 
         if (!preg_match(self::PATTERN, $value)) {
-            $this->setMessage($constraint->message, array('value' => $value));
+            $this->setMessage($constraint->message, array('{{ value }}' => $value));
 
             return false;
         }
@@ -32,7 +32,7 @@ public function isValid($value, Constraint $constraint)
             $host = substr($value, strpos($value, '@') + 1);
 
             if (!$this->checkMX($host)) {
-                $this->setMessage($constraint->message, array('value' => $value));
+                $this->setMessage($constraint->message, array('{{ value }}' => $value));
 
                 return false;
             }

diff --git a/src/Symfony/Component/Validator/Constraints/FileValidator.php b/src/Symfony/Component/Validator/Constraints/FileValidator.php
@@ -27,13 +27,13 @@ public function isValid($value, Constraint $constraint)
         $path = $value instanceof FileObject ? $value->getPath() : (string)$value;
 
         if (!file_exists($path)) {
-            $this->setMessage($constraint->notFoundMessage, array('file' => $path));
+            $this->setMessage($constraint->notFoundMessage, array('{{ file }}' => $path));
 
             return false;
         }
 
         if (!is_readable($path)) {
-            $this->setMessage($constraint->notReadableMessage, array('file' => $path));
+            $this->setMessage($constraint->notReadableMessage, array('{{ file }}' => $path));
 
             return false;
         }
@@ -57,9 +57,9 @@ public function isValid($value, Constraint $constraint)
 
             if ($size > $limit) {
                 $this->setMessage($constraint->maxSizeMessage, array(
-                    'size' => $size . $suffix,
-                    'limit' => $limit . $suffix,
-                    'file' => $path,
+                    '{{ size }}' => $size . $suffix,
+                    '{{ limit }}' => $limit . $suffix,
+                    '{{ file }}' => $path,
                 ));
 
                 return false;
@@ -73,9 +73,9 @@ public function isValid($value, Constraint $constraint)
 
             if (!in_array($value->getMimeType(), (array)$constraint->mimeTypes)) {
                 $this->setMessage($constraint->mimeTypesMessage, array(
-                    'type' => '"'.$value->getMimeType().'"',
-                    'types' => '"'.implode('", "', (array)$constraint->mimeTypes).'"',
-                    'file' => $path,
+                    '{{ type }}' => '"'.$value->getMimeType().'"',
+                    '{{ types }}' => '"'.implode('", "', (array)$constraint->mimeTypes).'"',
+                    '{{ file }}' => $path,
                 ));
 
                 return false;

diff --git a/src/Symfony/Component/Validator/Constraints/MaxLengthValidator.php b/src/Symfony/Component/Validator/Constraints/MaxLengthValidator.php
@@ -24,8 +24,8 @@ public function isValid($value, Constraint $constraint)
 
         if ($length > $constraint->limit) {
             $this->setMessage($constraint->message, array(
-                'value' => $value,
-                'limit' => $constraint->limit,
+                '{{ value }}' => $value,
+                '{{ limit }}' => $constraint->limit,
             ));
 
             return false;

diff --git a/src/Symfony/Component/Validator/Constraints/MaxValidator.php b/src/Symfony/Component/Validator/Constraints/MaxValidator.php
@@ -20,8 +20,8 @@ public function isValid($value, Constraint $constraint)
 
         if ($value > $constraint->limit) {
             $this->setMessage($constraint->message, array(
-                'value' => $value,
-                'limit' => $constraint->limit,
+                '{{ value }}' => $value,
+                '{{ limit }}' => $constraint->limit,
             ));
 
             return false;

diff --git a/src/Symfony/Component/Validator/Constraints/MinLengthValidator.php b/src/Symfony/Component/Validator/Constraints/MinLengthValidator.php
@@ -24,8 +24,8 @@ public function isValid($value, Constraint $constraint)
 
         if ($length < $constraint->limit) {
             $this->setMessage($constraint->message, array(
-                'value' => $value,
-                'limit' => $constraint->limit,
+                '{{ value }}' => $value,
+                '{{ limit }}' => $constraint->limit,
             ));
 
             return false;

diff --git a/src/Symfony/Component/Validator/Constraints/MinValidator.php b/src/Symfony/Component/Validator/Constraints/MinValidator.php
@@ -20,8 +20,8 @@ public function isValid($value, Constraint $constraint)
 
         if ($value < $constraint->limit) {
             $this->setMessage($constraint->message, array(
-                'value' => $value,
-                'limit' => $constraint->limit,
+                '{{ value }}' => $value,
+                '{{ limit }}' => $constraint->limit,
             ));
 
             return false;

diff --git a/src/Symfony/Component/Validator/Constraints/NullValidator.php b/src/Symfony/Component/Validator/Constraints/NullValidator.php
@@ -10,7 +10,7 @@ class NullValidator extends ConstraintValidator
     public function isValid($value, Constraint $constraint)
     {
         if (!is_null($value)) {
-            $this->setMessage($constraint->message, array('value' => $value));
+            $this->setMessage($constraint->message, array('{{ value }}' => $value));
 
             return false;
         }

diff --git a/src/Symfony/Component/Validator/Constraints/RegexValidator.php b/src/Symfony/Component/Validator/Constraints/RegexValidator.php
@@ -26,7 +26,7 @@ public function isValid($value, Constraint $constraint)
             (!$constraint->match && preg_match($constraint->pattern, $value))
         )
         {
-            $this->setMessage($constraint->message, array('value' => $value));
+            $this->setMessage($constraint->message, array('{{ value }}' => $value));
 
             return false;
         }

diff --git a/src/Symfony/Component/Validator/Constraints/TimeValidator.php b/src/Symfony/Component/Validator/Constraints/TimeValidator.php
@@ -23,7 +23,7 @@ public function isValid($value, Constraint $constraint)
         $value = (string)$value;
 
         if (!preg_match(self::PATTERN, $value)) {
-            $this->setMessage($constraint->message, array('value' => $value));
+            $this->setMessage($constraint->message, array('{{ value }}' => $value));
 
             return false;
         }

diff --git a/src/Symfony/Component/Validator/Constraints/UrlValidator.php b/src/Symfony/Component/Validator/Constraints/UrlValidator.php
@@ -34,7 +34,7 @@ public function isValid($value, Constraint $constraint)
         $pattern = sprintf(self::PATTERN, implode('|', $constraint->protocols));
 
         if (!preg_match($pattern, $value)) {
-            $this->setMessage($constraint->message, array('value' => $value));
+            $this->setMessage($constraint->message, array('{{ value }}' => $value));
 
             return false;
         }

diff --git a/src/Symfony/Component/Validator/Constraints/ValidValidator.php b/src/Symfony/Component/Validator/Constraints/ValidValidator.php
@@ -27,7 +27,7 @@ public function isValid($value, Constraint $constraint)
         } else if (!is_object($value)) {
             throw new UnexpectedTypeException($value, 'object or array');
         } else if ($constraint->class && !$value instanceof $constraint->class) {
-            $this->setMessage($constraint->message, array('class' => $constraint->class));
+            $this->setMessage($constraint->message, array('{{ class }}' => $constraint->class));
 
             return false;
         } else {

diff --git a/tests/Symfony/Tests/Component/Validator/Constraints/AssertTypeValidatorTest.php b/tests/Symfony/Tests/Component/Validator/Constraints/AssertTypeValidatorTest.php
@@ -101,8 +101,8 @@ public function testMessageIsSet()
         $this->assertFalse($this->validator->isValid('foobar', $constraint));
         $this->assertEquals($this->validator->getMessageTemplate(), 'myMessage');
         $this->assertEquals($this->validator->getMessageParameters(), array(
-            'value' => 'foobar',
-            'type' => 'numeric',
+            '{{ value }}' => 'foobar',
+            '{{ type }}' => 'numeric',
         ));
     }
 

diff --git a/tests/Symfony/Tests/Component/Validator/Constraints/BlankValidatorTest.php b/tests/Symfony/Tests/Component/Validator/Constraints/BlankValidatorTest.php
@@ -51,7 +51,7 @@ public function testMessageIsSet()
         $this->assertFalse($this->validator->isValid('foobar', $constraint));
         $this->assertEquals($this->validator->getMessageTemplate(), 'myMessage');
         $this->assertEquals($this->validator->getMessageParameters(), array(
-            'value' => 'foobar',
+            '{{ value }}' => 'foobar',
         ));
     }
 }
diff --git a/tests/Symfony/Tests/Component/Validator/Constraints/ChoiceValidatorTest.php b/tests/Symfony/Tests/Component/Validator/Constraints/ChoiceValidatorTest.php
@@ -118,7 +118,7 @@ public function testInvalidChoice()
         $this->assertFalse($this->validator->isValid('baz', $constraint));
         $this->assertEquals($this->validator->getMessageTemplate(), 'myMessage');
         $this->assertEquals($this->validator->getMessageParameters(), array(
-            'value' => 'baz',
+            '{{ value }}' => 'baz',
         ));
     }
 
@@ -133,7 +133,7 @@ public function testInvalidChoiceMultiple()
         $this->assertFalse($this->validator->isValid(array('foo', 'baz'), $constraint));
         $this->assertEquals($this->validator->getMessageTemplate(), 'myMessage');
         $this->assertEquals($this->validator->getMessageParameters(), array(
-            'value' => 'baz',
+            '{{ value }}' => 'baz',
         ));
     }
 
@@ -149,7 +149,7 @@ public function testTooFewChoices()
         $this->assertFalse($this->validator->isValid(array('foo'), $constraint));
         $this->assertEquals($this->validator->getMessageTemplate(), 'myMessage');
         $this->assertEquals($this->validator->getMessageParameters(), array(
-            'limit' => 2,
+            '{{ limit }}' => 2,
         ));
     }
 
@@ -165,7 +165,7 @@ public function testTooManyChoices()
         $this->assertFalse($this->validator->isValid(array('foo', 'bar', 'moo'), $constraint));
         $this->assertEquals($this->validator->getMessageTemplate(), 'myMessage');
         $this->assertEquals($this->validator->getMessageParameters(), array(
-            'limit' => 2,
+            '{{ limit }}' => 2,
         ));
     }
 }
diff --git a/tests/Symfony/Tests/Component/Validator/Constraints/DateTimeValidatorTest.php b/tests/Symfony/Tests/Component/Validator/Constraints/DateTimeValidatorTest.php
@@ -76,7 +76,7 @@ public function testMessageIsSet()
         $this->assertFalse($this->validator->isValid('foobar', $constraint));
         $this->assertEquals($this->validator->getMessageTemplate(), 'myMessage');
         $this->assertEquals($this->validator->getMessageParameters(), array(
-            'value' => 'foobar',
+            '{{ value }}' => 'foobar',
         ));
     }
 }
diff --git a/tests/Symfony/Tests/Component/Validator/Constraints/DateValidatorTest.php b/tests/Symfony/Tests/Component/Validator/Constraints/DateValidatorTest.php
@@ -70,7 +70,7 @@ public function testMessageIsSet()
         $this->assertFalse($this->validator->isValid('foobar', $constraint));
         $this->assertEquals($this->validator->getMessageTemplate(), 'myMessage');
         $this->assertEquals($this->validator->getMessageParameters(), array(
-            'value' => 'foobar',
+            '{{ value }}' => 'foobar',
         ));
     }
 }
diff --git a/tests/Symfony/Tests/Component/Validator/Constraints/EmailValidatorTest.php b/tests/Symfony/Tests/Component/Validator/Constraints/EmailValidatorTest.php
@@ -70,7 +70,7 @@ public function testMessageIsSet()
         $this->assertFalse($this->validator->isValid('foobar', $constraint));
         $this->assertEquals($this->validator->getMessageTemplate(), 'myMessage');
         $this->assertEquals($this->validator->getMessageParameters(), array(
-            'value' => 'foobar',
+            '{{ value }}' => 'foobar',
         ));
     }
 }