Skip to content

FIX: isConnected() does not detect that the server closed the connection #95

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pvgnd wants to merge 1 commit into
base: master
Choose a base branch
from
Open

FIX: isConnected() does not detect that the server closed the connection #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/SftpAdapter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -623,8 +623,8 @@ public function setVisibility($path, $visibility)
*/
public function isConnected()
{
if ($this->connection instanceof SFTP && $this->connection->isConnected()) {
return true;
if ($this->connection instanceof SFTP) {
return $this->connection->ping();
}

return false;
Expand Down
8 changes: 4 additions & 4 deletions tests/SftpAdapterTests.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public function adapterProvider()
$adapter = new Sftp(['username' => 'test', 'password' => 'test']);
$mock = Mockery::mock('phpseclib\Net\SFTP')->makePartial();
$mock->shouldReceive('__toString')->andReturn('Net_SFTP');
$mock->shouldReceive('isConnected')->andReturn(true);
$mock->shouldReceive('ping')->andReturn(true);
$mock->shouldReceive('disconnect');
$adapter->setNetSftpConnection($mock);
$filesystem = new Filesystem($adapter);
Expand Down Expand Up @@ -517,7 +517,7 @@ public function testLoginFail($filesystem, $adapter, $mock)
public function testIsConnected($filesystem, SftpAdapter $adapter, $mock)
{
$adapter->setNetSftpConnection($mock);
$mock->shouldReceive('isConnected')->andReturn(true);
$mock->shouldReceive('ping')->andReturn(true);
$this->assertTrue($adapter->isConnected());
}

Expand All @@ -532,7 +532,7 @@ public function testIsNotConnected($filesystem, SftpAdapter $adapter)
$mock = Mockery::mock('phpseclib\Net\SFTP');
$mock->shouldReceive('__toString')->andReturn('Net_SFTP');
$mock->shouldReceive('disconnect');
$mock->shouldReceive('isConnected')->andReturn(false);
$mock->shouldReceive('ping')->andReturn(false);
$adapter->setNetSftpConnection($mock);
$this->assertFalse($adapter->isConnected());
}
Expand Down Expand Up @@ -600,7 +600,7 @@ public function testNetSftpConnectionSetter()
'NetSftpConnection' => $mock = Mockery::mock('phpseclib\Net\SFTP'),
];

$mock->shouldReceive('isConnected')->andReturn(true);
$mock->shouldReceive('ping')->andReturn(true);
$mock->shouldReceive('disconnect');

$adapter = new Sftp($settings);
Expand Down