Merge remote-tracking branch 'upstream/master'

zendframework · May 9, 2013 · b0a48ab · b0a48ab
commit b0a48ab
Show file tree

Hide file tree

Showing 24 changed files with 70 additions and 142 deletions.
diff --git a/composer.json b/composer.json
@@ -35,8 +35,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.4-dev",
-            "dev-develop": "2.5-dev"
+            "dev-master": "2.2-dev",
+            "dev-develop": "2.3-dev"
         }
     },
     "autoload-dev": {

diff --git a/src/AbstractAdapter.php b/src/AbstractAdapter.php
@@ -3,9 +3,8 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Captcha
  */
 
 namespace Zend\Captcha;
@@ -17,10 +16,6 @@
  * Base class for Captcha adapters
  *
  * Provides some utility functionality to build on
- *
- * @category   Zend
- * @package    Zend_Captcha
- * @subpackage Adapter
  */
 abstract class AbstractAdapter extends AbstractValidator implements AdapterInterface
 {
@@ -84,10 +79,10 @@ public function setOption($key, $value)
             return $this;
         }
 
-        $method = 'set' . ucfirst ($key);
-        if (method_exists ($this, $method)) {
+        $method = 'set' . ucfirst($key);
+        if (method_exists($this, $method)) {
             // Setter exists; use it
-            $this->$method ($value);
+            $this->$method($value);
             $this->options[$key] = $value;
         } elseif (property_exists($this, $key)) {
             // Assume it's metadata

diff --git a/src/AbstractWord.php b/src/AbstractWord.php
@@ -3,24 +3,19 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Captcha
  */
 
 namespace Zend\Captcha;
 
-use Zend\Session\Container;
 use Zend\Math\Rand;
+use Zend\Session\Container;
 
 /**
  * AbstractWord-based captcha adapter
  *
  * Generates random word which user should recognise
- *
- * @category   Zend
- * @package    Zend_Captcha
- * @subpackage Adapter
  */
 abstract class AbstractWord extends AbstractAdapter
 {
@@ -64,28 +59,28 @@ abstract class AbstractWord extends AbstractAdapter
     /**
      * Should the numbers be used or only letters
      *
-     * @var boolean
+     * @var bool
      */
     protected $useNumbers = true;
 
     /**
      * Should both cases be used or only lowercase
      *
-     * @var boolean
+     * @var bool
      */
     // protected $useCase = false;
 
     /**
      * Session lifetime for the captcha data
      *
-     * @var integer
+     * @var int
      */
     protected $timeout = 300;
 
     /**
      * Should generate() keep session or create a new one?
      *
-     * @var boolean
+     * @var bool
      */
     protected $keepSession = false;
 
@@ -110,7 +105,7 @@ abstract class AbstractWord extends AbstractAdapter
     /**
      * Length of the word to generate
      *
-     * @var integer
+     * @var int
      */
     protected $wordlen = 8;
 
@@ -139,7 +134,7 @@ public function setSessionClass($sessionClass)
     /**
      * Retrieve word length to use when generating captcha
      *
-     * @return integer
+     * @return int
      */
     public function getWordlen()
     {
@@ -149,7 +144,7 @@ public function getWordlen()
     /**
      * Set word length of captcha
      *
-     * @param integer $wordlen
+     * @param int $wordlen
      * @return AbstractWord
      */
     public function setWordlen($wordlen)
@@ -253,7 +248,7 @@ public function getSession()
                 throw new Exception\InvalidArgumentException("Session class $this->sessionClass not found");
             }
             $this->session = new $this->sessionClass('Zend_Form_Captcha_' . $id);
-            $this->session->setExpirationHops(1, null, true);
+            $this->session->setExpirationHops(1, null);
             $this->session->setExpirationSeconds($this->getTimeout());
         }
         return $this->session;

diff --git a/src/AdapterInterface.php b/src/AdapterInterface.php
@@ -3,9 +3,8 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Captcha
  */
 
 namespace Zend\Captcha;
@@ -16,10 +15,6 @@
  * Generic Captcha adapter interface
  *
  * Each specific captcha implementation should implement this interface
- *
- * @category   Zend
- * @package    Zend_Captcha
- * @subpackage Adapter
  */
 interface AdapterInterface extends ValidatorInterface
 {

diff --git a/src/Dumb.php b/src/Dumb.php
@@ -3,9 +3,8 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Captcha
  */
 
 namespace Zend\Captcha;
@@ -16,9 +15,6 @@
  * Note that only rendering is necessary for word-based captcha
  *
  * @todo       This likely needs its own validation since it expects the word entered to be the strrev of the word stored.
- * @category   Zend
- * @package    Zend_Captcha
- * @subpackage Adapter
 */
 class Dumb extends AbstractWord
 {

diff --git a/src/Exception/DomainException.php b/src/Exception/DomainException.php
@@ -3,18 +3,12 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Captcha
  */
 
 namespace Zend\Captcha\Exception;
 
-/**
- * @category   Zend
- * @package    Zend_Captcha
- * @subpackage Exception
- */
 class DomainException extends \DomainException implements ExceptionInterface
 {
 }
diff --git a/src/Exception/ExceptionInterface.php b/src/Exception/ExceptionInterface.php
@@ -3,19 +3,14 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Captcha
  */
 
 namespace Zend\Captcha\Exception;
 
 /**
  * Exception for Zend_Form component.
- *
- * @category   Zend
- * @package    Zend_Captcha
- * @subpackage Exception
  */
 interface ExceptionInterface
 {

diff --git a/src/Exception/ExtensionNotLoadedException.php b/src/Exception/ExtensionNotLoadedException.php
@@ -3,19 +3,14 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Captcha
  */
 
 namespace Zend\Captcha\Exception;
 
 /**
  * Exception for Zend_Form component.
- *
- * @category   Zend
- * @package    Zend_Captcha
- * @subpackage Exception
  */
 class ExtensionNotLoadedException extends RuntimeException
 {

diff --git a/src/Exception/ImageNotLoadableException.php b/src/Exception/ImageNotLoadableException.php
@@ -3,19 +3,14 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Captcha
  */
 
 namespace Zend\Captcha\Exception;
 
 /**
  * Exception for Zend_Form component.
- *
- * @category   Zend
- * @package    Zend_Captcha
- * @subpackage Exception
  */
 class ImageNotLoadableException extends RuntimeException
 {

diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
@@ -3,18 +3,12 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Captcha
  */
 
 namespace Zend\Captcha\Exception;
 
-/**
- * @category   Zend
- * @package    Zend_Captcha
- * @subpackage Exception
- */
 class InvalidArgumentException extends \InvalidArgumentException implements
     ExceptionInterface
 {

diff --git a/src/Exception/NoFontProvidedException.php b/src/Exception/NoFontProvidedException.php
@@ -3,19 +3,14 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Captcha
  */
 
 namespace Zend\Captcha\Exception;
 
 /**
  * Exception for Zend_Form component.
- *
- * @category   Zend
- * @package    Zend_Captcha
- * @subpackage Exception
  */
 class NoFontProvidedException extends InvalidArgumentException
 {

diff --git a/src/Exception/RuntimeException.php b/src/Exception/RuntimeException.php
@@ -3,17 +3,11 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Captcha
  */
 
 namespace Zend\Captcha\Exception;
 
-/**
- * @category   Zend
- * @package    Zend_Captcha
- * @subpackage Exception
- */
 class RuntimeException extends \RuntimeException implements ExceptionInterface
 {}
diff --git a/src/Factory.php b/src/Factory.php
@@ -3,20 +3,15 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Captcha
  */
 
 namespace Zend\Captcha;
 
 use Traversable;
 use Zend\Stdlib\ArrayUtils;
 
-/**
- * @category   Zend
- * @package    Zend_Captcha
- */
 abstract class Factory
 {
     /**

diff --git a/src/Figlet.php b/src/Figlet.php
@@ -3,9 +3,8 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Captcha
  */
 
 namespace Zend\Captcha;
@@ -16,10 +15,6 @@
  * Captcha based on figlet text rendering service
  *
  * Note that this engine seems not to like numbers
- *
- * @category   Zend
- * @package    Zend_Captcha
- * @subpackage Adapter
  */
 class Figlet extends AbstractWord
 {