From e9553f40ad88101094e536e85598e370115f1050 Mon Sep 17 00:00:00 2001 From: lightray22 Date: Sun, 21 Feb 2021 20:12:26 +0000 Subject: [PATCH 1/3] fix undefined index notice in stream touch() --- phpseclib/Net/SFTP/Stream.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpseclib/Net/SFTP/Stream.php b/phpseclib/Net/SFTP/Stream.php index 89a0e59b2..9d736587a 100644 --- a/phpseclib/Net/SFTP/Stream.php +++ b/phpseclib/Net/SFTP/Stream.php @@ -447,7 +447,7 @@ private function _stream_metadata($path, $option, $var) // and https://github.com/php/php-src/blob/master/main/php_streams.h#L592 switch ($option) { case 1: // PHP_STREAM_META_TOUCH - return $this->sftp->touch($path, $var[0], $var[1]); + return $this->sftp->touch($path, $var[0] ?? null, $var[1] ?? null); case 2: // PHP_STREAM_OWNER_NAME case 3: // PHP_STREAM_GROUP_NAME return false; From 0cb9e4776353e444e5467a7d456290e0cdf3fc65 Mon Sep 17 00:00:00 2001 From: lightray22 Date: Sun, 21 Feb 2021 21:14:49 +0000 Subject: [PATCH 2/3] fix for PHP 5 --- phpseclib/Net/SFTP/Stream.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/phpseclib/Net/SFTP/Stream.php b/phpseclib/Net/SFTP/Stream.php index 9d736587a..fde41d9fd 100644 --- a/phpseclib/Net/SFTP/Stream.php +++ b/phpseclib/Net/SFTP/Stream.php @@ -447,7 +447,11 @@ private function _stream_metadata($path, $option, $var) // and https://github.com/php/php-src/blob/master/main/php_streams.h#L592 switch ($option) { case 1: // PHP_STREAM_META_TOUCH - return $this->sftp->touch($path, $var[0] ?? null, $var[1] ?? null); + { + $time = isset($var[0]) ? $var[0] : null; + $atime = isset($var[1]) ? $var[1] : null; + return $this->sftp->touch($path, $time, $atime); + } case 2: // PHP_STREAM_OWNER_NAME case 3: // PHP_STREAM_GROUP_NAME return false; From fdd01a5756090af8a48a4813a0d221ca727ac61a Mon Sep 17 00:00:00 2001 From: lightray22 Date: Sun, 21 Feb 2021 22:12:31 +0000 Subject: [PATCH 3/3] remove curly braces --- phpseclib/Net/SFTP/Stream.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/phpseclib/Net/SFTP/Stream.php b/phpseclib/Net/SFTP/Stream.php index fde41d9fd..ccbc09ac0 100644 --- a/phpseclib/Net/SFTP/Stream.php +++ b/phpseclib/Net/SFTP/Stream.php @@ -447,11 +447,9 @@ private function _stream_metadata($path, $option, $var) // and https://github.com/php/php-src/blob/master/main/php_streams.h#L592 switch ($option) { case 1: // PHP_STREAM_META_TOUCH - { $time = isset($var[0]) ? $var[0] : null; $atime = isset($var[1]) ? $var[1] : null; return $this->sftp->touch($path, $time, $atime); - } case 2: // PHP_STREAM_OWNER_NAME case 3: // PHP_STREAM_GROUP_NAME return false;