Skip to content
This repository has been archived by the owner on Jan 29, 2020. It is now read-only.

Commit

Permalink
Merge branch 'feature/docblock-simplification' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@Maks3w
Maks3w committed Jan 21, 2013
109 parents 31dd8a4 + 9ff9be3 + 5dac197 + 9d93ff3 + 3c8246c + fb7fe0d + b48b6da + 2059af5 + 4ae89ca + cf168bb + 408e6bb + 9f0ffb8 + 7ecfaa2 + 6a7896d + 8155a5c + 8ee5274 + 72c713c + 8ab0513 + 91eef93 + fce24bf + c98293e + ec0fa7a + 2480ecd + 6cbdeb6 + 0199841 + d0ceadd + b97ed64 + 5c81acc + c5ba1f2 + e88cbee + 2bb2543 + 6b85d76 + fd4fc1d + e1d654d + 76a55f3 + 5da873b + 671e880 + adb24c8 + 747da8c + f10d37b + 236506b + b82daca + 8448457 + 6aae974 + 553bc5e + 8034fb8 + 93bfd1f + 60514d9 + fb2affc + 0c035b2 + a837c00 + 7f54326 + 2aa633d + 5b66a63 + 5ab46dd + e59b115 + 76643a9 + c3c4da3 + f86842a + c09b55e + 44b848c + 5a4da57 + d43bca0 + cd5dffb + 5d7867c + 1f8bc83 + c5ab2f3 + 7a52da4 + bb2812c + f7972b4 + 0abbe02 + aefc063 + b47bdc4 + 8b3028a + 1b8822c + 4030a36 + ca4117d + a3994fc + 370778a + 759aeb3 + c30b3a1 + adc7329 + 612a636 + 32d2e16 + 341bf73 + e7e036f + 78908ef + 4681cd6 + 48b29d9 + 2b55177 + a4d8212 + 065fc43 + efaac86 + ea7550c + e2c7598 + 2e787c6 + be4f66c + f4112ef + c78bda6 + 50fa70e + 39305c8 + b576f04 + 0d6e151 + 3cfe9f5 + b2638b1 + ae88ee0 + 65185d9 + aa2dce6 + befa345 commit 55b2216
Show file tree
Hide file tree
Showing 15 changed files with 0 additions and 77 deletions.
5 changes: 0 additions & 5 deletions src/AbstractAdapter.php
View file
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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;
Expand All @@ -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
{
Expand Down
5 changes: 0 additions & 5 deletions src/AbstractWord.php
View file
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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;
Expand All @@ -17,10 +16,6 @@
* AbstractWord-based captcha adapter
*
* Generates random word which user should recognise
*
* @category Zend
* @package Zend_Captcha
* @subpackage Adapter
*/
abstract class AbstractWord extends AbstractAdapter
{
Expand Down
5 changes: 0 additions & 5 deletions src/AdapterInterface.php
View file
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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;
Expand All @@ -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
{
Expand Down
4 changes: 0 additions & 4 deletions src/Dumb.php
View file
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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;
Expand All @@ -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
{
Expand Down
6 changes: 0 additions & 6 deletions src/Exception/DomainException.php
View file
Expand Up @@ -5,16 +5,10 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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
{
}
5 changes: 0 additions & 5 deletions src/Exception/ExceptionInterface.php
View file
Expand Up @@ -5,17 +5,12 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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
{
Expand Down
5 changes: 0 additions & 5 deletions src/Exception/ExtensionNotLoadedException.php
View file
Expand Up @@ -5,17 +5,12 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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
{
Expand Down
5 changes: 0 additions & 5 deletions src/Exception/ImageNotLoadableException.php
View file
Expand Up @@ -5,17 +5,12 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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
{
Expand Down
6 changes: 0 additions & 6 deletions src/Exception/InvalidArgumentException.php
View file
Expand Up @@ -5,16 +5,10 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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
{
Expand Down
5 changes: 0 additions & 5 deletions src/Exception/NoFontProvidedException.php
View file
Expand Up @@ -5,17 +5,12 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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
{
Expand Down
6 changes: 0 additions & 6 deletions src/Exception/RuntimeException.php
View file
Expand Up @@ -5,15 +5,9 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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
{}
5 changes: 0 additions & 5 deletions src/Factory.php
View file
Expand Up @@ -5,18 +5,13 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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
{
/**
Expand Down
5 changes: 0 additions & 5 deletions src/Figlet.php
View file
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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;
Expand All @@ -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
{
Expand Down
5 changes: 0 additions & 5 deletions src/Image.php
View file
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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;
Expand All @@ -18,10 +17,6 @@
* Image-based captcha element
*
* Generates image displaying random word
*
* @category Zend
* @package Zend_Captcha
* @subpackage Adapter
*/
class Image extends AbstractWord
{
Expand Down
5 changes: 0 additions & 5 deletions src/ReCaptcha.php
View file
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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;
Expand All @@ -19,10 +18,6 @@
* Allows to insert captchas driven by ReCaptcha service
*
* @see http://recaptcha.net/apidocs/captcha/
*
* @category Zend
* @package Zend_Captcha
* @subpackage Adapter
*/
class ReCaptcha extends AbstractAdapter
{
Expand Down

0 comments on commit 55b2216

Please sign in to comment.