Merge branch 'hotfix/42'

Close #42

CHANGELOG.md

@@ -18,7 +18,11 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#42](https://github.com/zendframework/zend-i18n/pull/42) fixes the
+  behavior of the `PhoneNumber` validator to store the country using the casing
+  provided, but validate based on the uppercased country value. This ensures
+  the same validation behavior, and prevents the value from being transformed,
+  potentially breaking later retrieval.
 
 ## 2.7.2 - 2016-04-18
 

src/Validator/PhoneNumber.php

@@ -154,7 +154,7 @@ public function getCountry()
      */
     public function setCountry($country)
     {
-        $this->country = strtoupper($country);
+        $this->country = $country;
 
         return $this;
     }
@@ -201,12 +201,12 @@ public function isValid($value = null, $context = null)
 
         $country = $this->getCountry();
 
-        if (!$countryPattern = $this->loadPattern($country)) {
+        if (!$countryPattern = $this->loadPattern(strtoupper($country))) {
             if (isset($context[$country])) {
                 $country = $context[$country];
             }
 
-            if (!$countryPattern = $this->loadPattern($country)) {
+            if (!$countryPattern = $this->loadPattern(strtoupper($country))) {
                 $this->error(self::UNSUPPORTED);
 
                 return false;

test/Validator/PhoneNumberTest.php

@@ -3164,10 +3164,12 @@ public function testAllowPossibleSetterGetter()
         $this->assertTrue($this->validator->allowPossible());
     }
 
-    public function testSetCountryMethodIsCaseInsensitive()
+    public function testCountryIsCaseInsensitive()
     {
-        $this->validator->setCountry('us');
-        $this->assertSame('US', $this->validator->getCountry());
+        $this->validator->setCountry('lt');
+        $this->assertTrue($this->validator->isValid('+37067811268'));
+        $this->validator->setCountry('LT');
+        $this->assertTrue($this->validator->isValid('+37067811268'));
     }
 
     /**
@@ -3202,4 +3204,14 @@ public function testInvalidTypes($country, $code, $patterns)
             }
         }
     }
+
+    public function testCanSpecifyCountryWithContext()
+    {
+        Locale::setDefault('ZW');
+        $validator = new PhoneNumber([
+            'country' => 'country-code',
+        ]);
+
+        $this->assertTrue($validator->isValid('+37067811268', ['country-code' => 'LT']));
+    }
 }