From 57c724a37f965cde004643c328c19393fd6b109a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antonio=20J=2E=20Garc=C3=ADa=20Lagar?= <aj@garcialagar.es>
Date: Sun, 28 Apr 2013 18:50:39 +0200
Subject: [PATCH] [Validator] Rename issn constraint message option to be
 consistent with all constraints having a single message option

---
 src/Symfony/Component/Validator/Constraints/Issn.php      | 2 +-
 .../Component/Validator/Constraints/IssnValidator.php     | 4 ++--
 .../Validator/Tests/Constraints/IssnValidatorTest.php     | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Symfony/Component/Validator/Constraints/Issn.php b/src/Symfony/Component/Validator/Constraints/Issn.php
index 19e832204a..d7d77b6571 100644
--- a/src/Symfony/Component/Validator/Constraints/Issn.php
+++ b/src/Symfony/Component/Validator/Constraints/Issn.php
@@ -20,7 +20,7 @@ use Symfony\Component\Validator\Constraint;
  */
 class Issn extends Constraint
 {
-    public $invalidMessage = 'This value is not a valid ISSN.';
+    public $message = 'This value is not a valid ISSN.';
     public $caseSensitive = false;
     public $requireHyphen = false;
 }
diff --git a/src/Symfony/Component/Validator/Constraints/IssnValidator.php b/src/Symfony/Component/Validator/Constraints/IssnValidator.php
index d571991e0c..7e0baa876d 100644
--- a/src/Symfony/Component/Validator/Constraints/IssnValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/IssnValidator.php
@@ -43,7 +43,7 @@ class IssnValidator extends ConstraintValidator
         $pattern = "/^".$digitsPattern.$checksumPattern."$/";
 
         if (!preg_match($pattern, $value)) {
-            $this->context->addViolation($constraint->invalidMessage);
+            $this->context->addViolation($constraint->message);
         } else {
             $digits = str_split(strtoupper(str_replace('-', '', $value)));
 
@@ -55,7 +55,7 @@ class IssnValidator extends ConstraintValidator
             $checksum = 'X' == reset($digits) ? 10 : (int) reset($digits);
 
             if (0 != ($sum + $checksum) % 11) {
-                $this->context->addViolation($constraint->invalidMessage);
+                $this->context->addViolation($constraint->message);
             }
         }
     }
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/IssnValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/IssnValidatorTest.php
index b93cf658ba..d9e4884662 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/IssnValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/IssnValidatorTest.php
@@ -145,7 +145,7 @@ class IssnValidatorTest extends \PHPUnit_Framework_TestCase
         $this->context
             ->expects($this->once())
             ->method('addViolation')
-            ->with($constraint->invalidMessage);
+            ->with($constraint->message);
 
         $this->validator->validate($issn, $constraint);
     }
@@ -159,7 +159,7 @@ class IssnValidatorTest extends \PHPUnit_Framework_TestCase
         $this->context
             ->expects($this->once())
             ->method('addViolation')
-            ->with($constraint->invalidMessage);
+            ->with($constraint->message);
 
         $this->validator->validate($issn, $constraint);
     }
@@ -186,7 +186,7 @@ class IssnValidatorTest extends \PHPUnit_Framework_TestCase
         $this->context
             ->expects($this->once())
             ->method('addViolation')
-            ->with($constraint->invalidMessage);
+            ->with($constraint->message);
 
         $this->validator->validate($issn, $constraint);
     }
@@ -200,7 +200,7 @@ class IssnValidatorTest extends \PHPUnit_Framework_TestCase
         $this->context
             ->expects($this->once())
             ->method('addViolation')
-            ->with($constraint->invalidMessage);
+            ->with($constraint->message);
 
         $this->validator->validate($issn, $constraint);
     }