mirror of
https://github.com/phpseclib/phpseclib.git
synced 2024-12-26 11:37:33 +00:00
fix bad merge
This commit is contained in:
parent
5701295017
commit
95432478c0
@ -11,6 +11,7 @@
|
|||||||
using underscore. -->
|
using underscore. -->
|
||||||
<exclude name="PSR1.Classes.ClassDeclaration.MissingNamespace" />
|
<exclude name="PSR1.Classes.ClassDeclaration.MissingNamespace" />
|
||||||
<exclude name="Squiz.Classes.ValidClassName.NotCamelCaps" />
|
<exclude name="Squiz.Classes.ValidClassName.NotCamelCaps" />
|
||||||
|
<exclude name="PSR1.Classes.ClassDeclaration.MultipleClasses" />
|
||||||
</rule>
|
</rule>
|
||||||
|
|
||||||
</ruleset>
|
</ruleset>
|
||||||
|
@ -151,7 +151,7 @@ class Functional_Net_SFTPUserStoryTest extends PhpseclibFunctionalTestCase
|
|||||||
public function testPutSizeGetFile($sftp)
|
public function testPutSizeGetFile($sftp)
|
||||||
{
|
{
|
||||||
$this->assertTrue(
|
$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().'
|
'Failed asserting that example data could be successfully put().'
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -170,16 +170,6 @@ class Functional_Net_SFTPUserStoryTest extends PhpseclibFunctionalTestCase
|
|||||||
return $sftp;
|
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
|
* @depends testStatOnDir
|
||||||
*/
|
*/
|
||||||
@ -187,7 +177,7 @@ class Functional_Net_SFTPUserStoryTest extends PhpseclibFunctionalTestCase
|
|||||||
{
|
{
|
||||||
self::$buffer = self::$exampleData;
|
self::$buffer = self::$exampleData;
|
||||||
$this->assertTrue(
|
$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().'
|
'Failed asserting that example data could be successfully put().'
|
||||||
);
|
);
|
||||||
|
|
||||||
|
@ -35,7 +35,7 @@ class SHA256_96Test extends SHA256Test
|
|||||||
{
|
{
|
||||||
public function getInstance()
|
public function getInstance()
|
||||||
{
|
{
|
||||||
return new Crypt_Hash('sha256-96');
|
return new Hash('sha256-96');
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -35,7 +35,7 @@ class SHA512_96Test extends SHA512Test
|
|||||||
{
|
{
|
||||||
public function getInstance()
|
public function getInstance()
|
||||||
{
|
{
|
||||||
return new Crypt_Hash('sha512-96');
|
return new Hash('sha512-96');
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -184,13 +184,8 @@ U9VQQSQzY1oZMVX8i1m5WUTLPz2yLJIBQVdXqhMCQBGoiuSoSjafUhV7i1cEGpb88h5NBYZzWXGZ
|
|||||||
|
|
||||||
$this->assertTrue($rsa->loadKey($key));
|
$this->assertTrue($rsa->loadKey($key));
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
$key = $rsa->getPrivateKey(RSA::PRIVATE_FORMAT_PKCS8);
|
$key = $rsa->getPrivateKey(RSA::PRIVATE_FORMAT_PKCS8);
|
||||||
$this->assertInternalType('string', $key);
|
|
||||||
=======
|
|
||||||
$key = $rsa->getPrivateKey(CRYPT_RSA_PRIVATE_FORMAT_PKCS8);
|
|
||||||
$this->assertIsString($key);
|
$this->assertIsString($key);
|
||||||
>>>>>>> 1.0
|
|
||||||
|
|
||||||
$this->assertTrue($rsa->loadKey($key));
|
$this->assertTrue($rsa->loadKey($key));
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user