octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2024-05-28 14:10:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix bad merge

Browse Source
This commit is contained in:
terrafrost 2020-12-12 19:34:38 -06:00
parent e4bf7b111a
commit 7237c0f803
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,7 +14,7 @@ class Functional_Net_SSH2Test extends PhpseclibFunctionalTestCase
{
$ssh = new SSH2($this->getEnv('SSH_HOSTNAME'));
$this->assertIsObject
$this->assertIsObject(
$ssh,
'Could not construct NET_SSH2 object.'
);

1
tests/Unit/Crypt/RSA/LoadKeyTest.php
View File

@ -574,7 +574,6 @@ mKVKf5kPx2aR2W2KAcgw3TJIu1QX7N+l3kFrf9Owtz1a
-----END ENCRYPTED PRIVATE KEY-----';
$pass = 'asdf';
<<<<<<< HEAD
$this->pkcs8tester($key, $pass);
}

2
tests/Unit/Math/BigInteger/PHP64Test.php
View File

@ -36,6 +36,6 @@ class Unit_Math_BigInteger_PHP64Test extends Unit_Math_BigInteger_TestCase
}
}
classs PHP64Test extends Unit_Math_BigInteger_PHP64Test
class PHP64Test extends Unit_Math_BigInteger_PHP64Test
{
}

2
travis/run-phpunit.sh
View File

@ -27,6 +27,8 @@ then
find tests -type f -name "*.php" -print0 | xargs -0 sed -i 's/n tearDown()/n tearDown(): void/g'
find tests -type f -name "*.php" -print0 | xargs -0 sed -i 's/\(n assertIsArray([^)]*)\)/\1: void/g'
find tests -type f -name "*.php" -print0 | xargs -0 sed -i 's/\(n assertIsString([^)]*)\)/\1: void/g'
find tests -type f -name "*.php" -print0 | xargs -0 sed -i 's/\(n assertIsResource([^)]*)\)/\1: void/g'
find tests -type f -name "*.php" -print0 | xargs -0 sed -i 's/\(n assertIsObject([^)]*)\)/\1: void/g'
find tests -type f -name "*.php" -print0 | xargs -0 sed -i 's/\(n assertStringContainsString([^)]*)\)/\1: void/g'
find tests -type f -name "*.php" -print0 | xargs -0 sed -i 's/\(n assertStringNotContainsString([^)]*)\)/\1: void/g'
fi