diff --git a/src/SftpAdapter.php b/src/SftpAdapter.php index 013e13e..f9b7a18 100644 --- a/src/SftpAdapter.php +++ b/src/SftpAdapter.php @@ -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; diff --git a/tests/SftpAdapterTests.php b/tests/SftpAdapterTests.php index e6cf3f4..7f24e46 100644 --- a/tests/SftpAdapterTests.php +++ b/tests/SftpAdapterTests.php @@ -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); @@ -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()); } @@ -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()); } @@ -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);