Merge PHLAK:hotfix/gravatar-trim-strtolower into master

Pull request zendframework/zendframework#4976 Merge commit 'refs/pull/4976/head' of github.com:zendframework/zf2
zendframework · Aug 18, 2013 · e1a1ab3 · e1a1ab3
2 parents 76c4d1c + bdd7659
commit e1a1ab3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/Helper/Gravatar.php b/src/Helper/Gravatar.php
@@ -239,7 +239,7 @@ public function getDefaultImg()
     public function setEmail($email)
     {
         $this->emailIsHashed = (bool) preg_match('/^[A-Za-z0-9]{32}$/', $email);
-        $this->email = $email;
+        $this->email = strtolower(trim($email));
         return $this;
     }
 

diff --git a/test/Helper/GravatarTest.php b/test/Helper/GravatarTest.php
@@ -274,4 +274,11 @@ public function testInvalidKeyPassedToSetOptionsMethod()
         );
         $this->helper->__invoke()->setOptions($options);
     }
+
+    public function testEmailIsProperlyNormalized()
+    {
+        $this->assertEquals('example@example.com',
+            $this->helper->__invoke('Example@Example.com ')->getEmail()
+        );
+    }
 }