MAGETWO-66354: Fixed phpseclib\Net\SFTP constants used in write() method #6894

vrann · vrann · commit 8e2b713044f4 · 2017-03-20T05:46:49.000-07:00
- Merge Pull Request #6894 from federivo/magento2:phpseclib-net-sftp-constants
diff --git a/lib/internal/Magento/Framework/Filesystem/Io/Sftp.php b/lib/internal/Magento/Framework/Filesystem/Io/Sftp.php
@@ -20,7 +20,7 @@ class Sftp extends AbstractIo
     const SSH2_PORT = 22;
 
     /**
-     * @var \Net_SFTP $_connection
+     * @var \phpseclib\Net\SFTP $_connection
      */
     protected $_connection = null;
 
@@ -184,7 +184,7 @@ public function read($filename, $destination = null)
      */
     public function write($filename, $source, $mode = null)
     {
-        $mode = is_readable($source) ? NET_SFTP_LOCAL_FILE : NET_SFTP_STRING;
+        $mode = is_readable($source) ? \phpseclib\Net\SFTP::SOURCE_LOCAL_FILE : \phpseclib\Net\SFTP::SOURCE_STRING;
         return $this->_connection->put($filename, $source, $mode);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class Sftp extends AbstractIo`
`20`	`20`	`const SSH2_PORT = 22;`
`21`	`21`
`22`	`22`	`/**`
`23`		`- * @var \Net_SFTP $_connection`
	`23`	`+ * @var \phpseclib\Net\SFTP $_connection`
`24`	`24`	`*/`
`25`	`25`	`protected $_connection = null;`
`26`	`26`
`@@ -184,7 +184,7 @@ public function read($filename, $destination = null)`
`184`	`184`	`*/`
`185`	`185`	`public function write($filename, $source, $mode = null)`
`186`	`186`	`{`
`187`		`- $mode = is_readable($source) ? NET_SFTP_LOCAL_FILE : NET_SFTP_STRING;`
	`187`	`+ $mode = is_readable($source) ? \phpseclib\Net\SFTP::SOURCE_LOCAL_FILE : \phpseclib\Net\SFTP::SOURCE_STRING;`
`188`	`188`	`return $this->_connection->put($filename, $source, $mode);`
`189`	`189`	`}`
`190`	`190`