diff --git a/.gitignore b/.gitignore index 10a34bbfd122..514a99b10e83 100755 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ /vendor +/.idea composer.phar composer.lock .DS_Store diff --git a/composer.json b/composer.json index 00e724b89ef9..9392e2a25895 100755 --- a/composer.json +++ b/composer.json @@ -10,7 +10,7 @@ } ], "require": { - "php": ">=5.4.0", + "php": ">=8.2.0", "classpreloader/classpreloader": "~1.0.2", "d11wtq/boris": "~1.0", "ircmaxell/password-compat": "~1.0", @@ -19,7 +19,7 @@ "monolog/monolog": "~1.6", "nesbot/carbon": "~1.0", "patchwork/utf8": "~1.1", - "phpseclib/phpseclib": "0.3.*", + "phpseclib/phpseclib": "~2.0", "predis/predis": "0.8.*", "stack/builder": "~1.0", "swiftmailer/swiftmailer": "~5.1", @@ -92,5 +92,10 @@ "suggest": { "doctrine/dbal": "Allow renaming columns and dropping SQLite columns." }, - "minimum-stability": "dev" + "minimum-stability": "dev", + "config": { + "allow-plugins": { + "kylekatarnls/update-helper": true + } + } } diff --git a/src/Illuminate/Remote/SecLibGateway.php b/src/Illuminate/Remote/SecLibGateway.php index c4730197446c..e966b07ba093 100644 --- a/src/Illuminate/Remote/SecLibGateway.php +++ b/src/Illuminate/Remote/SecLibGateway.php @@ -1,7 +1,10 @@ host, $this->port) = explode(':', $host); + [$this->host, $this->port] = explode(':', $host); $this->port = (int) $this->port; } @@ -139,7 +142,7 @@ public function getString($remote) */ public function put($local, $remote) { - $this->getConnection()->put($remote, $local, NET_SFTP_LOCAL_FILE); + $this->getConnection()->put($remote, $local, SFTP::SOURCE_LOCAL_FILE); } /** @@ -161,7 +164,7 @@ public function putString($remote, $contents) */ public function nextLine() { - $value = $this->getConnection()->_get_channel_packet(NET_SSH2_CHANNEL_EXEC); + $value = $this->getConnection()->_get_channel_packet(SSH2::CHANNEL_EXEC); return $value === true ? null : $value; } @@ -169,7 +172,7 @@ public function nextLine() /** * Get the authentication object for login. * - * @return \Crypt_RSA|\System_SSH_Agent|string + * @return RSA|Agent|string * @throws \InvalidArgumentException */ protected function getAuthForLogin() @@ -211,7 +214,7 @@ protected function hasRsaKey() * Load the RSA key instance. * * @param array $auth - * @return \Crypt_RSA + * @return RSA */ protected function loadRsaKey(array $auth) { @@ -237,7 +240,7 @@ protected function readRsaKey(array $auth) * Create a new RSA key instance. * * @param array $auth - * @return \Crypt_RSA + * @return RSA */ protected function getKey(array $auth) { @@ -259,21 +262,21 @@ protected function useAgent() /** * Get a new SSH Agent instance. * - * @return \System_SSH_Agent + * @return Agent */ public function getAgent() { - return new System_SSH_Agent; + return new Agent; } /** * Get a new RSA key instance. * - * @return \Crypt_RSA + * @return RSA */ public function getNewKey() { - return new Crypt_RSA; + return new RSA; } /** @@ -307,15 +310,15 @@ public function getPort() } /** - * Get the underlying Net_SFTP connection. + * Get the underlying SFTP connection. * - * @return \Net_SFTP + * @return SFTP */ public function getConnection() { if ($this->connection) return $this->connection; - return $this->connection = new Net_SFTP($this->host, $this->port); + return $this->connection = new SFTP($this->host, $this->port); } } diff --git a/src/Illuminate/Remote/composer.json b/src/Illuminate/Remote/composer.json index f7bb904da6d6..b59ce8ddc2ff 100644 --- a/src/Illuminate/Remote/composer.json +++ b/src/Illuminate/Remote/composer.json @@ -11,7 +11,7 @@ "php": ">=5.4.0", "illuminate/filesystem": "4.2.*", "illuminate/support": "4.2.*", - "phpseclib/phpseclib": "0.3.*" + "phpseclib/phpseclib": "~2.0" }, "require-dev": { "illuminate/console": "4.2.*"