robin/smb
1
0
Fork 0
mirror of https://codeberg.org/icewind/SMB.git synced 2026-06-03 17:24:07 +02:00
Code Issues Projects Releases Packages Wiki Activity

minor cleanup

Browse source
This commit is contained in:
Robin Appelman 2018-01-18 13:25:37 +01:00
commit 569fcfd875
3 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/Connection.php
View file

@ -35,6 +35,7 @@ class Connection extends RawConnection {
} }
public function clearTillPrompt() { public function clearTillPrompt() {
$this->write('');
do { do {
$promptLine = $this->readLine(); $promptLine = $this->readLine();
} while (!$this->isPrompt($promptLine)); } while (!$this->isPrompt($promptLine));

1
src/Share.php
View file

@ -72,7 +72,6 @@ class Share extends AbstractShare {
if (!$connection->isValid()) { if (!$connection->isValid()) {
throw new ConnectionException($connection->readLine()); throw new ConnectionException($connection->readLine());
} }
$connection->write('');
// some versions of smbclient add a help message in first of the first prompt // some versions of smbclient add a help message in first of the first prompt
$connection->clearTillPrompt(); $connection->clearTillPrompt();
return $connection; return $connection;

2
tests/Share.php
View file

@ -24,7 +24,7 @@ class Share extends AbstractShare {
} }
/** /**
* @expectedException \Icewind\SMB\Exception\InvalidHostException * @expectedException \Icewind\SMB\Exception\ConnectException
*/ */
public function testHostEscape() { public function testHostEscape() {
$this->requireBackendEnv('smbclient'); $this->requireBackendEnv('smbclient');