octoleo
/
phpseclib
mirror of https://github.com/phpseclib/phpseclib.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix bad merge

This commit is contained in:
terrafrost 2020-12-12 17:15:52 -06:00
parent 5701295017
commit 95432478c0
5 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build/code-sniffer-ruleset-tests.xml
View File

@ -11,6 +11,7 @@
using underscore. -->
<exclude name="PSR1.Classes.ClassDeclaration.MissingNamespace" />
<exclude name="Squiz.Classes.ValidClassName.NotCamelCaps" />
<exclude name="PSR1.Classes.ClassDeclaration.MultipleClasses" />
</rule>
</ruleset>

14
tests/Functional/Net/SFTPUserStoryTest.php
View File

@ -151,7 +151,7 @@ class Functional_Net_SFTPUserStoryTest extends PhpseclibFunctionalTestCase
public function testPutSizeGetFile($sftp)
{
$this->assertTrue(
$sftp->put('file1.txt', array(__CLASS__, 'demoCallback'), NET_SFTP_CALLBACK),
$sftp->put('file1.txt', self::$exampleData),
'Failed asserting that example data could be successfully put().'
);
@ -170,16 +170,6 @@ class Functional_Net_SFTPUserStoryTest extends PhpseclibFunctionalTestCase
return $sftp;
}
static function callback($length)
{
$r = substr(self::$buffer, 0, $length);
self::$buffer = substr(self::$buffer, $length);
if (strlen($r)) {
return $r;
}
return null;
}
/**
* @depends testStatOnDir
*/
@ -187,7 +177,7 @@ class Functional_Net_SFTPUserStoryTest extends PhpseclibFunctionalTestCase
{
self::$buffer = self::$exampleData;
$this->assertTrue(
$sftp->put('file1.txt', array(__CLASS__, 'callback'), $sftp::SOURCE_CALLBACK),
$sftp->put('file1.txt', array(__CLASS__, 'demoCallback'), $sftp::SOURCE_CALLBACK),
'Failed asserting that example data could be successfully put().'
);

2
tests/Unit/Crypt/Hash/SHA256_96Test.php
View File

@ -35,7 +35,7 @@ class SHA256_96Test extends SHA256Test
{
public function getInstance()
{
return new Crypt_Hash('sha256-96');
return new Hash('sha256-96');
}
/**

2
tests/Unit/Crypt/Hash/SHA512_96Test.php
View File

@ -35,7 +35,7 @@ class SHA512_96Test extends SHA512Test
{
public function getInstance()
{
return new Crypt_Hash('sha512-96');
return new Hash('sha512-96');
}
/**

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

@ -184,13 +184,8 @@ U9VQQSQzY1oZMVX8i1m5WUTLPz2yLJIBQVdXqhMCQBGoiuSoSjafUhV7i1cEGpb88h5NBYZzWXGZ
$this->assertTrue($rsa->loadKey($key));
<<<<<<< HEAD
$key = $rsa->getPrivateKey(RSA::PRIVATE_FORMAT_PKCS8);
$this->assertInternalType('string', $key);
=======
$key = $rsa->getPrivateKey(CRYPT_RSA_PRIVATE_FORMAT_PKCS8);
$this->assertIsString($key);
>>>>>>> 1.0
$this->assertTrue($rsa->loadKey($key));
}