checking of 'host' part of URL is done in FTP drivers [Closes #146]

dg · Aug 27, 2021 · 8400555 · 8400555
1 parent 608f441
commit 8400555
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/src/Deployment/CliRunner.php b/src/Deployment/CliRunner.php
@@ -115,7 +115,7 @@ private function createDeployer(array $config): Deployer
 		if (
 			empty($config['remote'])
 			|| !($urlParts = parse_url($config['remote']))
-			|| !isset($urlParts['scheme'], $urlParts['host'])
+			|| !isset($urlParts['scheme'])
 		) {
 			throw new \Exception("Missing or invalid 'remote' URL in config.");
 		}

diff --git a/src/Deployment/FtpServer.php b/src/Deployment/FtpServer.php
@@ -47,10 +47,10 @@ public function __construct(string $url, bool $passiveMode = true)
 		}
 		$this->url = $url = parse_url($url);
 		if (
-			!isset($url['scheme'], $url['user'], $url['pass'])
+			!isset($url['scheme'], $url['user'], $url['pass'], $url['host'])
 			|| ($url['scheme'] !== 'ftp' && $url['scheme'] !== 'ftps')
 		) {
-			throw new \InvalidArgumentException('Invalid URL or missing username or password');
+			throw new \InvalidArgumentException('Invalid URL or missing username, password or host');
 		} elseif ($url['scheme'] === 'ftps' && !function_exists('ftp_ssl_connect')) {
 			throw new \Exception('PHP extension OpenSSL is not built statically in PHP.');
 		}

diff --git a/src/Deployment/PhpsecServer.php b/src/Deployment/PhpsecServer.php
@@ -38,7 +38,7 @@ public function __construct(
 		string $passPhrase = null
 	) {
 		$this->url = parse_url($url);
-		if (!isset($this->url['scheme'], $this->url['user']) || $this->url['scheme'] !== 'phpsec') {
+		if (!isset($this->url['scheme'], $this->url['user'], $this->url['host']) || $this->url['scheme'] !== 'phpsec') {
 			throw new \InvalidArgumentException('Invalid URL or missing username');
 		}
 		$this->publicKey = $publicKey;

diff --git a/src/Deployment/SshServer.php b/src/Deployment/SshServer.php
@@ -57,7 +57,7 @@ public function __construct(
 			throw new \Exception('PHP extension SSH2 is not loaded.');
 		}
 		$this->url = parse_url($url);
-		if (!isset($this->url['scheme'], $this->url['user']) || $this->url['scheme'] !== 'sftp') {
+		if (!isset($this->url['scheme'], $this->url['user'], $this->url['host']) || $this->url['scheme'] !== 'sftp') {
 			throw new \InvalidArgumentException('Invalid URL or missing username');
 		}
 		$this->publicKey = $publicKey;