Skip to content
This repository has been archived by the owner on Jan 30, 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
95 parents 0d09cdd + 6c1f55d + d6fc79f + ec6eb98 + 057e0a4 + aae626c + 219b3d0 + cf543d8 + 9a58915 + 4eb371b + 8dcc618 + 462d0bd + daaace8 + 8bc54c3 + f0b3a85 + f6e4e69 + b5ec01e + 58a4386 + 3c947fe + 69c3748 + 7b80138 + f1e35ed + 7867d92 + e4be59e + 4380c1e + 6d7fec5 + d34e28a + 3568aac + a037761 + e52d80a + 13ef28b + d64cb1c + 42c4029 + 9069765 + 40855ed + c1b1a58 + d43c1be + b348348 + 0640226 + 09868c6 + d3e357b + 50bd771 + 2595247 + aec938c + 5970dba + e723fba + f647c66 + e217698 + f887417 + 15e6fba + 247b5e3 + fa5adb5 + 0f90fd8 + 9bce0c4 + 13eb36a + d2ae723 + 9a31aee + 1710c35 + 463fe77 + 62e91e2 + bd639ae + 8e63b20 + 8a0d635 + a5df1f7 + 4f8e847 + 491fc5c + c8baa7a + 4e33a89 + 9ded697 + 93022ab + fe3adf7 + 9456eac + 806803b + a95e828 + 10e87df + c47fa1b + bb56470 + b181a00 + 42e4442 + a17281b + 18c91a6 + a2c2a31 + 6370cc9 + 0549582 + 9343e3d + fcefe15 + 959eb25 + 1b1dece + 9174cc0 + 2c7caf7 + eb50e25 + 9413151 + e9f9c3b + fef7dad + 56d8419 commit fe1b9af
Show file tree
Hide file tree
Showing 6 changed files with 4 additions and 21 deletions.
8 changes: 4 additions & 4 deletions src/Rand.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ public static function getBytes($length, $strong = false)
*/
public static function getAlternativeGenerator()
{
if (!is_null(self::$generator)) {
return self::$generator;
if (!is_null(static::$generator)) {
return static::$generator;
}
if (!class_exists('RandomLib\\Factory')) {
throw new Exception\RuntimeException(
Expand All @@ -90,8 +90,8 @@ public static function getAlternativeGenerator()
'HashTiming',
'Zend\Math\Source\HashTiming'
);
self::$generator = $factory->getMediumStrengthGenerator();
return self::$generator;
static::$generator = $factory->getMediumStrengthGenerator();
return static::$generator;
}

/**
Expand Down
1 change: 0 additions & 1 deletion test/BigInteger/Adapter/AbstractTestCase.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_Math
*/

namespace ZendTest\Math\BigInteger\Adapter;
Expand Down
4 changes: 0 additions & 4 deletions test/BigInteger/Adapter/BcmathTest.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_Math
*/

namespace ZendTest\Math\BigInteger\Adapter;

use Zend\Math\BigInteger\Adapter\Bcmath;

/**
* @category Zend
* @package Zend_Math_BigInteger
* @subpackage UnitTests
* @group Zend_Crypt
*/
class BcmathTest extends AbstractTestCase
Expand Down
4 changes: 0 additions & 4 deletions test/BigInteger/Adapter/GmpTest.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_Math
*/

namespace ZendTest\Math\BigInteger\Adapter;

use Zend\Math\BigInteger\Adapter\Gmp;

/**
* @category Zend
* @package Zend_Math_BigInteger
* @subpackage UnitTests
* @group Zend_Crypt
*/
class GmpTest extends AbstractTestCase
Expand Down
4 changes: 0 additions & 4 deletions test/BigInteger/BigIntegerTest.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_Math
*/

namespace ZendTest\Math\BigInteger;
Expand All @@ -15,9 +14,6 @@
use Zend\Math\BigInteger\Adapter\AdapterInterface;

/**
* @category Zend
* @package Zend_Math_BigInteger
* @subpackage UnitTests
* @group Zend_Math
*/
class BigIntegerTest extends \PHPUnit_Framework_TestCase
Expand Down
4 changes: 0 additions & 4 deletions test/RandTest.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_Math
*/

namespace ZendTest\Math;
Expand All @@ -15,9 +14,6 @@
use RandomLib;

/**
* @category Zend
* @package Zend_Math
* @subpackage UnitTests
* @group Zend_Math
*/
class RandTest extends \PHPUnit_Framework_TestCase
Expand Down

0 comments on commit fe1b9af

Please sign in to comment.