diff --git a/phpseclib/Net/SFTP.php b/phpseclib/Net/SFTP.php index cad3dc339..7ec705604 100644 --- a/phpseclib/Net/SFTP.php +++ b/phpseclib/Net/SFTP.php @@ -347,7 +347,7 @@ private function precheck(): bool */ private function partial_init_sftp_connection(): bool { - $response = $this->openChannel(self::CHANNEL, true); + $response = $this->open_channel(self::CHANNEL, true); if ($response === true && $this->isTimeout()) { return false; } diff --git a/phpseclib/Net/SSH2.php b/phpseclib/Net/SSH2.php index 157194791..4fe89b4b0 100644 --- a/phpseclib/Net/SSH2.php +++ b/phpseclib/Net/SSH2.php @@ -2540,7 +2540,7 @@ public function exec(string $command, callable $callback = null) // throw new RuntimeException('If you want to run multiple exec()\'s you will need to disable (and re-enable if appropriate) a PTY for each one.'); //} - $this->openChannel(self::CHANNEL_EXEC); + $this->open_channel(self::CHANNEL_EXEC); if ($this->request_pty === true) { $terminal_modes = pack('C', TerminalMode::TTY_OP_END); @@ -2633,7 +2633,7 @@ public function getOpenChannelCount() /** * Opens a channel */ - protected function openChannel(int $channel, bool $skip_extended = false): bool + protected function open_channel(int $channel, bool $skip_extended = false): bool { if (isset($this->channel_status[$channel]) && $this->channel_status[$channel] != MessageType::CHANNEL_CLOSE) { throw new RuntimeException('Please close the channel (' . $channel . ') before trying to open it again'); @@ -2689,7 +2689,7 @@ public function openShell(): bool throw new InsufficientSetupException('Operation disallowed prior to login()'); } - $this->openChannel(self::CHANNEL_SHELL); + $this->open_channel(self::CHANNEL_SHELL); $terminal_modes = pack('C', TerminalMode::TTY_OP_END); $packet = Strings::packSSH2( @@ -2926,7 +2926,7 @@ public function write(string $cmd, int $channel = null): void */ public function startSubsystem(string $subsystem): bool { - $this->openChannel(self::CHANNEL_SUBSYSTEM); + $this->open_channel(self::CHANNEL_SUBSYSTEM); $packet = Strings::packSSH2( 'CNsCs', @@ -3048,7 +3048,7 @@ public function isConnected(int $level = 0): bool if ($level == 1) { $this->send_binary_packet(pack('CN', NET_SSH2_MSG_IGNORE, 0)); } else { - $this->openChannel(self::CHANNEL_KEEP_ALIVE); + $this->open_channel(self::CHANNEL_KEEP_ALIVE); $this->close_channel(self::CHANNEL_KEEP_ALIVE); } return true; @@ -3117,7 +3117,7 @@ public function ping(): bool } try { - $this->openChannel(self::CHANNEL_KEEP_ALIVE); + $this->open_channel(self::CHANNEL_KEEP_ALIVE); } catch (\RuntimeException $e) { return $this->reconnect(); }