octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2024-12-25 03:16:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.0' into 2.0

Browse Source
This commit is contained in:
terrafrost 2017-12-14 23:49:10 -06:00
commit b02d78e92a
9 changed files with 6 additions and 4256 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

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

2
composer.json
View File

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

2334
composer.lock generated
View File

File diff suppressed because it is too large Load Diff

4
tests/Functional/Net/SSH2Test.php
View File

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

16
tests/PHPUnit_Framework_TestCase.php
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();
}
}

4
tests/PhpseclibTestCase.php
View File

@ -5,9 +5,7 @@
* @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();

76
travis/composer.legacy.json
View File

@ -1,76 +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.3.3"
},
"require-dev": {
"phing/phing": "~2.7",
"phpunit/phpunit": "~4.0",
"sami/sami": "~2.0",
"squizlabs/php_codesniffer": "~2.0"
},
"suggest": {
"ext-libsodium": "SSH2/SFTP can make use of some algorithms provided by the libsodium-php extension.",
"ext-openssl": "Install the OpenSSL extension in order to speed up a wide variety of cryptographic operations.",
"ext-mcrypt": "Install the Mcrypt extension in order to speed up a few other cryptographic operations.",
"ext-gmp": "Install the GMP (GNU Multiple Precision) extension in order to speed up arbitrary precision integer arithmetic operations."
},
"autoload": {
"files": [
"phpseclib/bootstrap.php"
],
"psr-4": {
"phpseclib\\": "phpseclib/"
}
}
}

1819
travis/composer.legacy.lock
View File

File diff suppressed because it is too large Load Diff

6
travis/setup-composer.sh
View File

@ -1,9 +1,3 @@
#!/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 install --no-interaction