Merge remote-tracking branch 'prolic/captcha' into prolic-zen-52

src/Word.php → src/AbstractWord.php

@@ -24,7 +24,7 @@
 use Zend\Session\Container;
 
 /**
- * Word-based captcha adapter
+ * AbstractWord-based captcha adapter
  *
  * Generates random word which user should recognise
  *
@@ -34,7 +34,7 @@
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-abstract class Word extends AbstractAdapter
+abstract class AbstractWord extends AbstractAdapter
 {
     /**#@+
      * @var array Character sets
@@ -140,7 +140,7 @@ public function getSessionClass()
      * Set session class for persistence
      *
      * @param  string $sessionClass
-     * @return Word
+     * @return AbstractWord
      */
     public function setSessionClass($sessionClass)
     {
@@ -162,7 +162,7 @@ public function getWordlen()
      * Set word length of captcha
      *
      * @param integer $wordlen
-     * @return Word
+     * @return AbstractWord
      */
     public function setWordlen($wordlen)
     {
@@ -199,7 +199,7 @@ protected function setId ($id)
      * Set timeout for session token
      *
      * @param  int $ttl
-     * @return Word
+     * @return AbstractWord
      */
     public function setTimeout($ttl)
     {
@@ -221,7 +221,7 @@ public function getTimeout()
      * Sets if session should be preserved on generate()
      *
      * @param $keepSession Should session be kept on generate()?
-     * @return Word
+     * @return AbstractWord
      */
     public function setKeepSession($keepSession)
     {
@@ -243,7 +243,7 @@ public function getUseNumbers()
      * Set if numbers should be included in the pattern
      *
      * @param  bool $useNumbers numbers should be included in the pattern?
-     * @return Word
+     * @return AbstractWord
      */
     public function setUseNumbers($useNumbers)
     {
@@ -274,7 +274,7 @@ public function getSession()
      * Set session namespace object
      *
      * @param  Container $session
-     * @return Word
+     * @return AbstractWord
      */
     public function setSession(Container $session)
     {
@@ -303,7 +303,7 @@ public function getWord()
      * Set captcha word
      *
      * @param  string $word
-     * @return Word
+     * @return AbstractWord
      */
     protected function setWord($word)
     {

src/Dumb.php

@@ -33,7 +33,7 @@
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
 */
-class Dumb extends Word
+class Dumb extends AbstractWord
 {
     /**
      * CAPTCHA label

src/Figlet.php

@@ -34,7 +34,7 @@
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Figlet extends Word
+class Figlet extends AbstractWord
 {
     /**
      * Figlet text renderer

src/Image.php

@@ -37,7 +37,7 @@
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Image extends Word
+class Image extends AbstractWord
 {
     /**
      * Directory for generated images