allow PHPUnit 4, 5 and 6

This commit is contained in:
Remi Collet 2017-12-14 07:31:32 +01:00 committed by terrafrost
parent 36e9992508
commit 8dc8642473
9 changed files with 6 additions and 4111 deletions

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
/vendor /vendor
/composer.phar /composer.phar
composer.lock

View File

@ -55,7 +55,7 @@
}, },
"require-dev": { "require-dev": {
"phing/phing": "~2.7", "phing/phing": "~2.7",
"phpunit/phpunit": "~6.0", "phpunit/phpunit": "^4.8.35|^5.7|^6.0",
"sami/sami": "~2.0", "sami/sami": "~2.0",
"squizlabs/php_codesniffer": "~2.0" "squizlabs/php_codesniffer": "~2.0"
}, },

2334
composer.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -106,7 +106,9 @@ class Functional_Net_SSH2Test extends PhpseclibFunctionalTestCase
*/ */
public function testExecWithMethodCallback($ssh) public function testExecWithMethodCallback($ssh)
{ {
$callbackObject = $this->getMock('stdClass', array('callbackMethod')); $callbackObject = $this->getMockBuilder('stdClass')
->setMethods(array('callbackMethod'))
->getMock();
$callbackObject $callbackObject
->expects($this->atLeastOnce()) ->expects($this->atLeastOnce())
->method('callbackMethod') ->method('callbackMethod')

View File

@ -1,16 +0,0 @@
<?php
/**
* @author Jim Wigginton <terrafrost@php.net>
* @copyright 2017 Jim Wigginton
* @license http://www.opensource.org/licenses/mit-license.html MIT License
*/
use PHPUnit\Framework\TestCase;
abstract class PHPUnit_Framework_TestCase extends PHPUnit\Framework\TestCase
{
public function getMock($className, $methodName)
{
return $this->getMockBuilder($className)->setMethods($methodName)->getMock();
}
}

View File

@ -5,9 +5,7 @@
* @license http://www.opensource.org/licenses/mit-license.html MIT License * @license http://www.opensource.org/licenses/mit-license.html MIT License
*/ */
include(__DIR__ . '/PHPUnit_Framework_TestCase.php'); abstract class PhpseclibTestCase extends PHPUnit\Framework\TestCase
abstract class PhpseclibTestCase extends PHPUnit_Framework_TestCase
{ {
protected $tempFilesToUnlinkOnTearDown = array(); protected $tempFilesToUnlinkOnTearDown = array();

View File

@ -1,81 +0,0 @@
{
"name": "phpseclib/phpseclib",
"type": "library",
"description": "PHP Secure Communications Library - Pure-PHP implementations of RSA, AES, SSH2, SFTP, X.509 etc.",
"keywords": [
"security",
"crypto",
"cryptography",
"encryption",
"signature",
"signing",
"rsa",
"aes",
"blowfish",
"twofish",
"ssh",
"sftp",
"x509",
"x.509",
"asn1",
"asn.1",
"BigInteger"
],
"homepage": "http://phpseclib.sourceforge.net",
"license": "MIT",
"authors": [
{
"name": "Jim Wigginton",
"email": "terrafrost@php.net",
"role": "Lead Developer"
},
{
"name": "Patrick Monnerat",
"email": "pm@datasphere.ch",
"role": "Developer"
},
{
"name": "Andreas Fischer",
"email": "bantu@phpbb.com",
"role": "Developer"
},
{
"name": "Hans-Jürgen Petrich",
"email": "petrich@tronic-media.com",
"role": "Developer"
},
{
"name": "Graham Campbell",
"email": "graham@alt-three.com",
"role": "Developer"
}
],
"require": {
"php": ">=5.0.0"
},
"require-dev": {
"phing/phing": "~2.7",
"phpunit/phpunit": "~4.0",
"sami/sami": "~2.0",
"squizlabs/php_codesniffer": "~2.0"
},
"suggest": {
"ext-mcrypt": "Install the Mcrypt extension in order to speed up a wide variety of cryptographic operations.",
"ext-gmp": "Install the GMP (GNU Multiple Precision) extension in order to speed up arbitrary precision integer arithmetic operations.",
"pear-pear/PHP_Compat": "Install PHP_Compat to get phpseclib working on PHP < 5.0.0."
},
"include-path": ["phpseclib/"],
"autoload": {
"psr-0": {
"Crypt": "phpseclib/",
"File": "phpseclib/",
"Math": "phpseclib/",
"Net": "phpseclib/",
"System": "phpseclib/"
},
"files": [
"phpseclib/bootstrap.php",
"phpseclib/Crypt/Random.php"
]
}
}

File diff suppressed because it is too large Load Diff

View File

@ -1,9 +1,3 @@
#!/bin/sh #!/bin/sh
if [ `php -r "echo (int) version_compare(PHP_VERSION, '7.0', '<');"` = "1" ]
then
cp travis/composer.legacy.json composer.json
cp travis/composer.legacy.lock composer.lock
sed -i "s/include(__DIR__ . '\/PHPUnit_Framework_TestCase.php');//g" tests/PhpseclibTestCase.php
fi
composer self-update --no-interaction composer self-update --no-interaction
composer install --no-interaction composer install --no-interaction