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

Commit

Permalink
Merge branch 'master', remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@EpeeCheeze
EpeeCheeze committed Oct 3, 2013
132 parents 4b7c2dd + 87209b0 + 58a623e + 829b708 + 1fcfba3 + 3615dc2 + 7e47a02 + 7938fdd + dfd9ef1 + 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 + 3cfe9f5 + 65185d9 + b2638b1 + aa2dce6 + 55b2216 + 31dd8a4 + 9ff9be3 + 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 + ae88ee0 + 31f4740 + 8f36ec1 + d3700db + 21a09bf + e078447 + d601abc + 45ba6c6 + 387c1b2 + 17de8c2 + faea519 + b0a48ab + 93ceca1 + 71b7099 + 7a34617 commit 26f0e1e
Show file tree
Hide file tree
Showing 8 changed files with 3 additions and 36 deletions.
4 changes: 0 additions & 4 deletions test/CommonWordTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,11 @@
* @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 ZendTest\Captcha;

/**
* @category Zend
* @package Zend_Captcha
* @subpackage UnitTests
* @group Zend_Captcha
*/
abstract class CommonWordTest extends \PHPUnit_Framework_TestCase
Expand Down
4 changes: 0 additions & 4 deletions test/DumbTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +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 ZendTest\Captcha;

use Zend\Captcha\Dumb as DumbCaptcha;

/**
* @category Zend
* @package Zend_Captcha
* @subpackage UnitTests
* @group Zend_Captcha
*/
class DumbTest extends CommonWordTest
Expand Down
6 changes: 0 additions & 6 deletions test/FactoryTest.php
View file
Original file line number Diff line number Diff line change
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 ZendTest\Captcha;
Expand All @@ -14,11 +13,6 @@
use PHPUnit_Framework_TestCase as TestCase;
use Zend\Captcha;

/**
* @category Zend
* @package Zend_Captcha
* @subpackage UnitTest
*/
class FactoryTest extends TestCase
{
protected $testDir;
Expand Down
4 changes: 0 additions & 4 deletions test/FigletTest.php
View file
Original file line number Diff line number Diff line change
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 ZendTest\Captcha;
Expand All @@ -15,9 +14,6 @@
use Zend\Session\Container as SessionContainer;

/**
* @category Zend
* @package Zend_Captcha
* @subpackage UnitTests
* @group Zend_Captcha
*/
class FigletTest extends CommonWordTest
Expand Down
4 changes: 0 additions & 4 deletions test/ImageTest.php
View file
Original file line number Diff line number Diff line change
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 ZendTest\Captcha;
Expand All @@ -14,9 +13,6 @@
use Zend\Captcha\Image as ImageCaptcha;

/**
* @category Zend
* @package Zend_Captcha
* @subpackage UnitTests
* @group Zend_Captcha
*/
class ImageTest extends \PHPUnit_Framework_TestCase
Expand Down
4 changes: 0 additions & 4 deletions test/ReCaptchaTest.php
View file
Original file line number Diff line number Diff line change
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 ZendTest\Captcha;
Expand All @@ -14,9 +13,6 @@
use ZendService\ReCaptcha\ReCaptcha as ReCaptchaService;

/**
* @category Zend
* @package Zend_Captcha
* @subpackage UnitTests
* @group Zend_Captcha
*/
class ReCaptchaTest extends \PHPUnit_Framework_TestCase
Expand Down
6 changes: 0 additions & 6 deletions test/TestAsset/MockCaptcha.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +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 ZendTest\Captcha\TestAsset;

use Zend\Captcha\AdapterInterface;

/**
* @category Zend
* @package Zend_Captcha
* @subpackage UnitTest
*/
class MockCaptcha implements AdapterInterface
{
public $name;
Expand Down
7 changes: 3 additions & 4 deletions test/TestAsset/SessionContainer.php
View file
Original file line number Diff line number Diff line change
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 ZendTest\Captcha\TestAsset;
Expand All @@ -17,7 +16,7 @@ class SessionContainer
public function __get($name)
{
if ('word' == $name) {
return self::$_word;
return static::$_word;
}

return null;
Expand All @@ -26,15 +25,15 @@ public function __get($name)
public function __set($name, $value)
{
if ('word' == $name) {
self::$_word = $value;
static::$_word = $value;
} else {
$this->$name = $value;
}
}

public function __isset($name)
{
if (('word' == $name) && (null !== self::$_word)) {
if (('word' == $name) && (null !== static::$_word)) {
return true;
}

Expand Down

0 comments on commit 26f0e1e

Please sign in to comment.