Merge branch 'hotfix/Captcha' of https://github.com/sasezaki/zf2 into…

… hotfix/validator-captcha-http_refactor

src/AbstractAdapter.php

@@ -135,7 +135,7 @@ public function setOption($key, $value)
      * @param  array $options
      * @return Zend_Form_Element
      */
-    public function setOptions($options = null)
+    public function setOptions(array $options = null)
     {
         foreach ($options as $key => $value) {
             $this->setOption($key, $value);

src/Word.php

@@ -388,20 +388,20 @@ public function isValid($value, $context = null)
         }
 
         if (!isset($value['input'])) {
-            $this->_error(self::MISSING_VALUE);
+            $this->error(self::MISSING_VALUE);
             return false;
         }
         $input = strtolower($value['input']);
-        $this->_setValue($input);
+        $this->setValue($input);
 
         if (!isset($value['id'])) {
-            $this->_error(self::MISSING_ID);
+            $this->error(self::MISSING_ID);
             return false;
         }
 
         $this->_id = $value['id'];
         if ($input !== $this->getWord()) {
-            $this->_error(self::BAD_CAPTCHA);
+            $this->error(self::BAD_CAPTCHA);
             return false;
         }