Merge pull request #65 from max-voloshin/update-phpseclib

Update phpseclib (PHP 7 compatibility)
tamagokun · May 13, 2016 · 1240911 · 1240911
2 parents 7121f2b + 1bd20bc
commit 1240911
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 28 deletions.
diff --git a/composer.json b/composer.json
@@ -14,7 +14,7 @@
   ],
   "require": {
     "jaz303/phake": "~0.6",
-    "phpseclib/phpseclib": "~1.0"
+    "phpseclib/phpseclib": "^2.0"
   },
   "require-dev": {
     "phpunit/phpunit": "@stable"

diff --git a/composer.lock b/composer.lock
diff --git a/lib/Pomander/RemoteShell.php b/lib/Pomander/RemoteShell.php
@@ -1,12 +1,15 @@
 <?php
 namespace Pomander;
 
+use phpseclib\Crypt\RSA;
+use phpseclib\Net\SSH2;
+
 class RemoteShell
 {
     /**
      * SSH
      *
-     * @var \Net_SSH2
+     * @var SSH2
      */
     protected $shell;
 
@@ -43,9 +46,9 @@ public function write($cmd)
 /* protected */
     protected function connect()
     {
-        $this->shell = new \Net_SSH2($this->host, $this->port);
+        $this->shell = new SSH2($this->host, $this->port);
         if (file_exists($this->auth)) {
-            $key = new \Crypt_RSA();
+            $key = new RSA();
             if ($this->key_pass) {
                 $key->setPassword($this->key_pass);
             }
@@ -70,7 +73,7 @@ protected function process()
         $offset = 0;
         $this->shell->_initShell();
         while( true ) {
-            $temp = $this->shell->_get_channel_packet(NET_SSH2_CHANNEL_EXEC);
+            $temp = $this->shell->_get_channel_packet(SSH2::CHANNEL_EXEC);
             switch( true ) {
                 case $temp === true:
                 case $temp === false: