From 94173ec58ecfe47dedcec54bb70d42998b9e341d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antonio=20J=2E=20Garc=C3=ADa=20Lagar?= <aj@garcialagar.es>
Date: Mon, 22 Apr 2013 20:32:17 +0200
Subject: [PATCH] Rename requireHyphens to requireHyphen for Issn constraint

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

diff --git a/src/Symfony/Component/Validator/Constraints/Issn.php b/src/Symfony/Component/Validator/Constraints/Issn.php
index 20bdcc7484..19e832204a 100644
--- a/src/Symfony/Component/Validator/Constraints/Issn.php
+++ b/src/Symfony/Component/Validator/Constraints/Issn.php
@@ -22,5 +22,5 @@ class Issn extends Constraint
 {
     public $invalidMessage = 'This value is not a valid ISSN.';
     public $caseSensitive = false;
-    public $requireHyphens = false;
+    public $requireHyphen = false;
 }
diff --git a/src/Symfony/Component/Validator/Constraints/IssnValidator.php b/src/Symfony/Component/Validator/Constraints/IssnValidator.php
index 907685a300..d571991e0c 100644
--- a/src/Symfony/Component/Validator/Constraints/IssnValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/IssnValidator.php
@@ -38,7 +38,7 @@ class IssnValidator extends ConstraintValidator
         }
 
         // Compose regex pattern
-        $digitsPattern = $constraint->requireHyphens ? '\d{4}-\d{3}' : '\d{4}-?\d{3}';
+        $digitsPattern = $constraint->requireHyphen ? '\d{4}-\d{3}' : '\d{4}-?\d{3}';
         $checksumPattern = $constraint->caseSensitive ? '[\d|X]' : '[\d|X|x]';
         $pattern = "/^".$digitsPattern.$checksumPattern."$/";
 
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/IssnValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/IssnValidatorTest.php
index 3b0c901435..b93cf658ba 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/IssnValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/IssnValidatorTest.php
@@ -153,9 +153,9 @@ class IssnValidatorTest extends \PHPUnit_Framework_TestCase
     /**
      * @dataProvider getValidNonHyphenatedIssn
      */
-    public function testRequireHyphensIssns($issn)
+    public function testRequireHyphenIssns($issn)
     {
-        $constraint = new Issn(array('requireHyphens' => true));
+        $constraint = new Issn(array('requireHyphen' => true));
         $this->context
             ->expects($this->once())
             ->method('addViolation')