Merge pull request #154 from vaidasm/hotfix/sftp2

Use phpseclib 2 constant
deployphp · Jan 30, 2015 · ec7dffd · ec7dffd
2 parents 9141b84 + c321b6b
commit ec7dffd
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/src/Server/PhpSecLib.php b/src/Server/PhpSecLib.php
@@ -7,10 +7,13 @@
 
 namespace Deployer\Server;
 
+use phpseclib\Crypt\RSA;
+use phpseclib\Net\SFTP;
+
 class PhpSecLib extends AbstractServer
 {
     /**
-     * @var \Net_SFTP
+     * @var \phpseclib\Net\SFTP
      */
     private $sftp;
 
@@ -25,7 +28,7 @@ class PhpSecLib extends AbstractServer
      */
     public function connect()
     {
-        $this->sftp = new \phpseclib\Net\SFTP($this->config->getHost(), $this->config->getPort());
+        $this->sftp = new SFTP($this->config->getHost(), $this->config->getPort());
 
         switch ($this->config->getAuthenticationMethod()) {
             case Configuration::AUTH_BY_PASSWORD:
@@ -38,7 +41,7 @@ public function connect()
 
             case Configuration::AUTH_BY_PUBLIC_KEY:
 
-                $key = new \phpseclib\Crypt\RSA();
+                $key = new RSA();
                 $key->setPassword($this->config->getPassPhrase());
                 $key->loadKey(file_get_contents($this->config->getPrivateKey()));
 
@@ -50,7 +53,7 @@ public function connect()
 
             case Configuration::AUTH_BY_PEM_FILE:
 
-                $key = new \phpseclib\Crypt\RSA();
+                $key = new RSA();
                 $key->loadKey(file_get_contents($this->config->getPemFile()));
                 if (!$this->sftp->login($this->config->getUser(), $key)) {
                     throw new \RuntimeException('Could not login with PhpSecLib.');
@@ -103,7 +106,7 @@ public function upload($local, $remote)
             $this->directories[$dir] = true;
         }
 
-        if (!$this->sftp->put($remote, $local, NET_SFTP_LOCAL_FILE)) {
+        if (!$this->sftp->put($remote, $local, SFTP::SOURCE_LOCAL_FILE)) {
             throw new \RuntimeException(implode($this->sftp->getSFTPErrors(), "\n"));
         }
     }