From 792314e851a2dfa149199888d1cfa15286e0a349 Mon Sep 17 00:00:00 2001 From: terrafrost Date: Mon, 26 Feb 2024 07:52:24 -0600 Subject: [PATCH] SSH2: openChannel -> open_channel makes openChannel snake case like close_channel already is. this is not a BC break as openChannel is protected --- phpseclib/Net/SFTP.php | 2 +- phpseclib/Net/SSH2.php | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/phpseclib/Net/SFTP.php b/phpseclib/Net/SFTP.php index 68134e879..144ef7950 100644 --- a/phpseclib/Net/SFTP.php +++ b/phpseclib/Net/SFTP.php @@ -547,7 +547,7 @@ private function precheck() */ private function partial_init_sftp_connection() { - $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 dc78db8d8..589dfec8d 100644 --- a/phpseclib/Net/SSH2.php +++ b/phpseclib/Net/SSH2.php @@ -2840,7 +2840,7 @@ public function exec($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', NET_SSH2_TTY_OP_END); @@ -2937,7 +2937,7 @@ public function getOpenChannelCount() * @param bool $skip_extended * @return bool */ - protected function openChannel($channel, $skip_extended = false) + protected function open_channel($channel, $skip_extended = false) { if (isset($this->channel_status[$channel]) && $this->channel_status[$channel] != NET_SSH2_MSG_CHANNEL_CLOSE) { throw new \RuntimeException('Please close the channel (' . $channel . ') before trying to open it again'); @@ -2994,7 +2994,7 @@ public function openShell() throw new InsufficientSetupException('Operation disallowed prior to login()'); } - $this->openChannel(self::CHANNEL_SHELL); + $this->open_channel(self::CHANNEL_SHELL); $terminal_modes = pack('C', NET_SSH2_TTY_OP_END); $packet = Strings::packSSH2( @@ -3242,7 +3242,7 @@ public function write($cmd, $channel = null) */ public function startSubsystem($subsystem) { - $this->openChannel(self::CHANNEL_SUBSYSTEM); + $this->open_channel(self::CHANNEL_SUBSYSTEM); $packet = Strings::packSSH2( 'CNsCs', @@ -3369,7 +3369,7 @@ public function isConnected($level = 0) 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; @@ -3448,7 +3448,7 @@ public function ping() } try { - $this->openChannel(self::CHANNEL_KEEP_ALIVE); + $this->open_channel(self::CHANNEL_KEEP_ALIVE); } catch (\RuntimeException $e) { return $this->reconnect(); }