Merge pull request zendframework/zendframework#1885 from weierophinne…

…y/hotfix/captcha-validator-messages Fix error messages in captcha validators
zendframework · Jul 13, 2012 · 72c713c · 72c713c
5 parents c98293e + 8ab0513 + 91eef93 + ec0fa7a + 9fa1b67
commit 72c713c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/src/AbstractWord.php b/src/AbstractWord.php
@@ -100,7 +100,7 @@ abstract class AbstractWord extends AbstractAdapter
      * Error messages
      * @var array
      */
-    protected $_messageTemplates = array(
+    protected $messageTemplates = array(
         self::MISSING_VALUE => 'Empty captcha value',
         self::MISSING_ID    => 'Captcha ID field is missing',
         self::BAD_CAPTCHA   => 'Captcha value is wrong',

diff --git a/src/ReCaptcha.php b/src/ReCaptcha.php
@@ -68,7 +68,7 @@ class ReCaptcha extends AbstractAdapter
      * Error messages
      * @var array
      */
-    protected $_messageTemplates = array(
+    protected $messageTemplates = array(
         self::MISSING_VALUE => 'Missing captcha fields',
         self::ERR_CAPTCHA   => 'Failed to validate captcha',
         self::BAD_CAPTCHA   => 'Captcha value is wrong: %value%',

diff --git a/test/CommonWordTest.php b/test/CommonWordTest.php
@@ -35,4 +35,12 @@ public function testLoadInvalidSessionClass()
         $this->setExpectedException('Zend\Captcha\Exception\InvalidArgumentException', 'not found');
         $wordAdapter->getSession();
     }
+
+    public function testErrorMessages()
+    {
+        $wordAdapter = new $this->wordClass;
+        $this->assertFalse($wordAdapter->isValid('foo'));
+        $messages = $wordAdapter->getMessages();
+        $this->assertFalse(empty($messages));
+    }
 }