D14577.id35269.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D14577.id35269.diff
View Options

	diff --git a/src/workflow/ArcanistInstallCertificateWorkflow.php b/src/workflow/ArcanistInstallCertificateWorkflow.php
	--- a/src/workflow/ArcanistInstallCertificateWorkflow.php
	+++ b/src/workflow/ArcanistInstallCertificateWorkflow.php
	@@ -56,9 +56,11 @@

	$config = $configuration_manager->readUserConfigurationFile();

	- $console->writeOut(
	- "%s\n",
	- pht('Trying to connect to server...'));
	+ $this->writeInfo(
	+ pht('CONNECT'),
	+ pht(
	+ 'Connecting to "%s"...',
	+ $uri));

	$conduit = $this->establishConduit()->getConduit();
	try {
	@@ -194,10 +196,19 @@
	$uri = $conduit_uri;
	}

	- $uri = new PhutilURI($uri);
	- $uri->setPath('/api/');
	+ $uri_object = new PhutilURI($uri);
	+ if (!$uri_object->getProtocol() \|\| !$uri_object->getDomain()) {
	+ throw new ArcanistUsageException(
	+ pht(
	+ 'Server URI "%s" must include a protocol and domain. It should be '.
	+ 'in the form "%s".',
	+ $uri,
	+ 'https://phabricator.example.com/'));
	+ }
	+
	+ $uri_object->setPath('/api/');

	- return (string)$uri;
	+ return (string)$uri_object;
	}

	}