diff --git a/composer.json b/composer.json index 5e08ed1..0e8aee1 100644 --- 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 index 015db98..6247ff9 100644 --- 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 index b565c6c..f95f753 100644 --- 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 index dd65ff1..ef89898 100644 --- 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 index b22514a..8409ec8 100644 --- 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 index be26042..c2374c3 100644 --- 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 index 1870cca..9cca7bb 100644 --- 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 index b3bdc9e..4c17b1f 100644 --- 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 index 4240074..5bbdea3 100644 --- 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 index 1fd7062..ae00058 100644 --- 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 index 8fa095a..bcfed6b 100644 --- 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 index 7bb0fe5..c6cdf96 100644 --- 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 index e9dbcac..3232e3a 100644 --- a/src/Factory.php +++ b/src/Factory.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; @@ -13,10 +12,6 @@ use Traversable; use Zend\Stdlib\ArrayUtils; -/** - * @category Zend - * @package Zend_Captcha - */ abstract class Factory { /** diff --git a/src/Figlet.php b/src/Figlet.php index 134df0d..3388bde 100644 --- 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 { diff --git a/src/Image.php b/src/Image.php index 4fe5b88..68a6e96 100644 --- a/src/Image.php +++ b/src/Image.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; @@ -18,10 +17,6 @@ * Image-based captcha element * * Generates image displaying random word - * - * @category Zend - * @package Zend_Captcha - * @subpackage Adapter */ class Image extends AbstractWord { @@ -490,7 +485,7 @@ protected function generateImage($id, $word) $h = $this->getHeight(); $fsize = $this->getFontSize(); - $img_file = $this->getImgDir() . $id . $this->getSuffix(); + $imgFile = $this->getImgDir() . $id . $this->getSuffix(); if (empty($this->startImage)) { $img = imagecreatetruecolor($w, $h); @@ -508,26 +503,26 @@ protected function generateImage($id, $word) $h = imagesy($img); } - $text_color = imagecolorallocate($img, 0, 0, 0); - $bg_color = imagecolorallocate($img, 255, 255, 255); - imagefilledrectangle($img, 0, 0, $w-1, $h-1, $bg_color); + $textColor = imagecolorallocate($img, 0, 0, 0); + $bgColor = imagecolorallocate($img, 255, 255, 255); + imagefilledrectangle($img, 0, 0, $w-1, $h-1, $bgColor); $textbox = imageftbbox($fsize, 0, $font, $word); $x = ($w - ($textbox[2] - $textbox[0])) / 2; $y = ($h - ($textbox[7] - $textbox[1])) / 2; - imagefttext($img, $fsize, 0, $x, $y, $text_color, $font, $word); + imagefttext($img, $fsize, 0, $x, $y, $textColor, $font, $word); // generate noise for ($i=0; $i < $this->dotNoiseLevel; $i++) { - imagefilledellipse($img, mt_rand(0, $w), mt_rand(0, $h), 2, 2, $text_color); + imagefilledellipse($img, mt_rand(0, $w), mt_rand(0, $h), 2, 2, $textColor); } for ($i=0; $i < $this->lineNoiseLevel; $i++) { - imageline($img, mt_rand(0, $w), mt_rand(0, $h), mt_rand(0, $w), mt_rand(0, $h), $text_color); + imageline($img, mt_rand(0, $w), mt_rand(0, $h), mt_rand(0, $w), mt_rand(0, $h), $textColor); } // transformed image $img2 = imagecreatetruecolor($w, $h); - $bg_color = imagecolorallocate($img2, 255, 255, 255); - imagefilledrectangle($img2, 0, 0, $w-1, $h-1, $bg_color); + $bgColor = imagecolorallocate($img2, 255, 255, 255); + imagefilledrectangle($img2, 0, 0, $w-1, $h-1, $bgColor); // apply wave transforms $freq1 = $this->randomFreq(); @@ -551,29 +546,29 @@ protected function generateImage($id, $word) if ($sx < 0 || $sy < 0 || $sx >= $w - 1 || $sy >= $h - 1) { continue; } else { - $color = (imagecolorat($img, $sx, $sy) >> 16) & 0xFF; - $color_x = (imagecolorat($img, $sx + 1, $sy) >> 16) & 0xFF; - $color_y = (imagecolorat($img, $sx, $sy + 1) >> 16) & 0xFF; - $color_xy = (imagecolorat($img, $sx + 1, $sy + 1) >> 16) & 0xFF; + $color = (imagecolorat($img, $sx, $sy) >> 16) & 0xFF; + $colorX = (imagecolorat($img, $sx + 1, $sy) >> 16) & 0xFF; + $colorY = (imagecolorat($img, $sx, $sy + 1) >> 16) & 0xFF; + $colorXY = (imagecolorat($img, $sx + 1, $sy + 1) >> 16) & 0xFF; } - if ($color == 255 && $color_x == 255 && $color_y == 255 && $color_xy == 255) { + if ($color == 255 && $colorX == 255 && $colorY == 255 && $colorXY == 255) { // ignore background continue; - } elseif ($color == 0 && $color_x == 0 && $color_y == 0 && $color_xy == 0) { + } elseif ($color == 0 && $colorX == 0 && $colorY == 0 && $colorXY == 0) { // transfer inside of the image as-is $newcolor = 0; } else { // do antialiasing for border items - $frac_x = $sx-floor($sx); - $frac_y = $sy-floor($sy); - $frac_x1 = 1-$frac_x; - $frac_y1 = 1-$frac_y; - - $newcolor = $color * $frac_x1 * $frac_y1 - + $color_x * $frac_x * $frac_y1 - + $color_y * $frac_x1 * $frac_y - + $color_xy * $frac_x * $frac_y; + $fracX = $sx - floor($sx); + $fracY = $sy - floor($sy); + $fracX1 = 1 - $fracX; + $fracY1 = 1 - $fracY; + + $newcolor = $color * $fracX1 * $fracY1 + + $colorX * $fracX * $fracY1 + + $colorY * $fracX1 * $fracY + + $colorXY * $fracX * $fracY; } imagesetpixel($img2, $x, $y, imagecolorallocate($img2, $newcolor, $newcolor, $newcolor)); @@ -582,14 +577,14 @@ protected function generateImage($id, $word) // generate noise for ($i=0; $i<$this->dotNoiseLevel; $i++) { - imagefilledellipse($img2, mt_rand(0, $w), mt_rand(0, $h), 2, 2, $text_color); + imagefilledellipse($img2, mt_rand(0, $w), mt_rand(0, $h), 2, 2, $textColor); } for ($i=0; $i<$this->lineNoiseLevel; $i++) { - imageline($img2, mt_rand(0, $w), mt_rand(0, $h), mt_rand(0, $w), mt_rand(0, $h), $text_color); + imageline($img2, mt_rand(0, $w), mt_rand(0, $h), mt_rand(0, $w), mt_rand(0, $h), $textColor); } - imagepng($img2, $img_file); + imagepng($img2, $imgFile); imagedestroy($img); imagedestroy($img2); } diff --git a/src/ReCaptcha.php b/src/ReCaptcha.php index d87f1c8..64c51c9 100644 --- a/src/ReCaptcha.php +++ b/src/ReCaptcha.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; @@ -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 { @@ -198,7 +193,7 @@ public function generate() * @see \Zend\Validator\ValidatorInterface::isValid() * @param mixed $value * @param mixed $context - * @return boolean + * @return bool */ public function isValid($value, $context = null) { diff --git a/test/CommonWordTest.php b/test/CommonWordTest.php index 15b062a..a8e4e52 100644 --- a/test/CommonWordTest.php +++ b/test/CommonWordTest.php @@ -3,7 +3,7 @@ * 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 */ diff --git a/test/DumbTest.php b/test/DumbTest.php index d797245..25f349a 100644 --- a/test/DumbTest.php +++ b/test/DumbTest.php @@ -3,7 +3,7 @@ * 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 */ diff --git a/test/FactoryTest.php b/test/FactoryTest.php index 5114678..47d1f78 100644 --- a/test/FactoryTest.php +++ b/test/FactoryTest.php @@ -3,7 +3,7 @@ * 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 */ diff --git a/test/FigletTest.php b/test/FigletTest.php index fb4bf6d..731285d 100644 --- a/test/FigletTest.php +++ b/test/FigletTest.php @@ -3,7 +3,7 @@ * 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 */ diff --git a/test/ImageTest.php b/test/ImageTest.php index e1e2359..a75d1cf 100644 --- a/test/ImageTest.php +++ b/test/ImageTest.php @@ -3,7 +3,7 @@ * 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 */ @@ -131,6 +131,11 @@ public function testCaptchaImageCleanup() */ public function testCaptchaImageCleanupOnlyCaptchaFilesIdentifiedByTheirSuffix() { + if (!defined('TESTS_ZEND_CAPTCHA_GC') + || !constant('TESTS_ZEND_CAPTCHA_GC') + ) { + $this->markTestSkipped('Enable TESTS_ZEND_CAPTCHA_GC to run this test'); + } $this->captcha->generate(); $filename = $this->testDir . "/" . $this->captcha->getId() . ".png"; $this->assertTrue(file_exists($filename)); diff --git a/test/ReCaptchaTest.php b/test/ReCaptchaTest.php index 6205c79..8f47a8b 100644 --- a/test/ReCaptchaTest.php +++ b/test/ReCaptchaTest.php @@ -3,7 +3,7 @@ * 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 */ diff --git a/test/TestAsset/MockCaptcha.php b/test/TestAsset/MockCaptcha.php index c843e6e..69f2f47 100644 --- a/test/TestAsset/MockCaptcha.php +++ b/test/TestAsset/MockCaptcha.php @@ -3,7 +3,7 @@ * 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 */ diff --git a/test/TestAsset/SessionContainer.php b/test/TestAsset/SessionContainer.php index 7d50482..ab90acb 100644 --- a/test/TestAsset/SessionContainer.php +++ b/test/TestAsset/SessionContainer.php @@ -3,7 +3,7 @@ * 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 */