diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 30cc621..c20c166 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -1,125 +1,127 @@
<?php
/**
* This file is automatically generated. Use 'phutil_mapper.php' to rebuild it.
* @generated
*/
phutil_register_library_map(array(
'class' =>
array(
'CommandException' => 'future/exec',
'ConduitClient' => 'conduit/client',
'ConduitClientException' => 'conduit/client',
'ConduitFuture' => 'conduit/client',
'ExecFuture' => 'future/exec',
'FileFinder' => 'filesystem/filefinder',
'FileList' => 'filesystem/filelist',
'Filesystem' => 'filesystem',
'FilesystemException' => 'filesystem',
'Future' => 'future',
'FutureIterator' => 'future',
'HTTPFuture' => 'future/http',
'PhutilConsoleFormatter' => 'console',
'PhutilDefaultSyntaxHighlighterEngine' => 'markup/syntax/engine/default',
'PhutilDocblockParser' => 'parser/docblock',
'PhutilDocblockParserTestCase' => 'parser/docblock/__tests__',
'PhutilInteractiveEditor' => 'console/editor',
'PhutilMarkupEngine' => 'markup/engine',
'PhutilMissingSymbolException' => 'symbols/exception/missing',
'PhutilRemarkupBlockStorage' => 'markup/engine/remarkup/blockstorage',
'PhutilRemarkupEngine' => 'markup/engine/remarkup',
'PhutilRemarkupEngineBlockRule' => 'markup/engine/remarkup/blockrule/base',
'PhutilRemarkupEngineRemarkupCodeBlockRule' => 'markup/engine/remarkup/blockrule/remarkupcode',
'PhutilRemarkupEngineRemarkupDefaultBlockRule' => 'markup/engine/remarkup/blockrule/remarkupdefault',
'PhutilRemarkupEngineRemarkupHeaderBlockRule' => 'markup/engine/remarkup/blockrule/remarkupheader',
'PhutilRemarkupEngineRemarkupInlineBlockRule' => 'markup/engine/remarkup/blockrule/remarkupinline',
'PhutilRemarkupEngineRemarkupListBlockRule' => 'markup/engine/remarkup/blockrule/remarkuplist',
'PhutilRemarkupRule' => 'markup/engine/remarkup/markuprule/base',
'PhutilRemarkupRuleBold' => 'markup/engine/remarkup/markuprule/bold',
'PhutilRemarkupRuleEscapeHTML' => 'markup/engine/remarkup/markuprule/escapehtml',
'PhutilRemarkupRuleEscapeRemarkup' => 'markup/engine/remarkup/markuprule/escaperemarkup',
'PhutilRemarkupRuleHyperlink' => 'markup/engine/remarkup/markuprule/hyperlink',
'PhutilRemarkupRuleItalic' => 'markup/engine/remarkup/markuprule/italics',
'PhutilRemarkupRuleLinebreaks' => 'markup/engine/remarkup/markuprule/linebreaks',
'PhutilRemarkupRuleMonospace' => 'markup/engine/remarkup/markuprule/monospace',
'PhutilSymbolLoader' => 'symbols',
'PhutilSyntaxHighlighter' => 'markup/syntax/highlighter/base',
'PhutilSyntaxHighlighterEngine' => 'markup/syntax/engine/base',
+ 'PhutilURI' => 'parser/uri',
'PhutilXHPASTSyntaxHighlighter' => 'markup/syntax/highlighter/xhpast',
'TempFile' => 'filesystem/tempfile',
'XHPASTNode' => 'parser/xhpast/api/node',
'XHPASTNodeList' => 'parser/xhpast/api/list',
'XHPASTSyntaxErrorException' => 'parser/xhpast/api/exception',
'XHPASTToken' => 'parser/xhpast/api/token',
'XHPASTTree' => 'parser/xhpast/api/tree',
'XHPASTTreeTestCase' => 'parser/xhpast/api/tree/__tests__',
),
'function' =>
array(
'Futures' => 'future',
'array_select_keys' => 'utils',
'coalesce' => 'utils',
'csprintf' => 'xsprintf/csprintf',
'exec_manual' => 'future/exec',
'execx' => 'future/exec',
'id' => 'utils',
'idx' => 'utils',
'igroup' => 'utils',
'ipull' => 'utils',
+ 'isort' => 'utils',
'jsprintf' => 'xsprintf/jsprintf',
'mgroup' => 'utils',
'mpull' => 'utils',
'msort' => 'utils',
'newv' => 'utils',
'nonempty' => 'utils',
'phutil_autoload_class' => 'autoload',
'phutil_console_confirm' => 'console',
'phutil_console_format' => 'console',
'phutil_console_prompt' => 'console',
'phutil_console_wrap' => 'console',
'phutil_escape_html' => 'markup',
'phutil_escape_uri' => 'markup',
'phutil_get_library_name_for_root' => 'moduleutils',
'phutil_get_library_root' => 'moduleutils',
'phutil_get_library_root_for_path' => 'moduleutils',
'phutil_render_tag' => 'markup',
'vcsprintf' => 'xsprintf/csprintf',
'vjsprintf' => 'xsprintf/jsprintf',
'xhp_parser_node_constants' => 'parser/xhpast/constants',
'xhpast_get_binary_path' => 'parser/xhpast/bin',
'xhpast_get_build_instructions' => 'parser/xhpast/bin',
'xhpast_get_parser_future' => 'parser/xhpast/bin',
'xhpast_is_available' => 'parser/xhpast/bin',
'xhpast_parser_token_constants' => 'parser/xhpast/constants',
'xsprintf' => 'xsprintf',
'xsprintf_callback_example' => 'xsprintf',
'xsprintf_command' => 'xsprintf/csprintf',
'xsprintf_javascript' => 'xsprintf/jsprintf',
),
'requires_class' =>
array(
'ConduitFuture' => 'HTTPFuture',
'ExecFuture' => 'Future',
'HTTPFuture' => 'Future',
'PhutilDefaultSyntaxHighlighterEngine' => 'PhutilSyntaxHighlighterEngine',
'PhutilDocblockParserTestCase' => 'ArcanistPhutilTestCase',
'PhutilRemarkupEngine' => 'PhutilMarkupEngine',
'PhutilRemarkupEngineRemarkupCodeBlockRule' => 'PhutilRemarkupEngineBlockRule',
'PhutilRemarkupEngineRemarkupDefaultBlockRule' => 'PhutilRemarkupEngineBlockRule',
'PhutilRemarkupEngineRemarkupHeaderBlockRule' => 'PhutilRemarkupEngineBlockRule',
'PhutilRemarkupEngineRemarkupInlineBlockRule' => 'PhutilRemarkupEngineBlockRule',
'PhutilRemarkupEngineRemarkupListBlockRule' => 'PhutilRemarkupEngineBlockRule',
'PhutilRemarkupRuleBold' => 'PhutilRemarkupRule',
'PhutilRemarkupRuleEscapeHTML' => 'PhutilRemarkupRule',
'PhutilRemarkupRuleEscapeRemarkup' => 'PhutilRemarkupRule',
'PhutilRemarkupRuleHyperlink' => 'PhutilRemarkupRule',
'PhutilRemarkupRuleItalic' => 'PhutilRemarkupRule',
'PhutilRemarkupRuleLinebreaks' => 'PhutilRemarkupRule',
'PhutilRemarkupRuleMonospace' => 'PhutilRemarkupRule',
'XHPASTTreeTestCase' => 'ArcanistPhutilTestCase',
),
'requires_interface' =>
array(
),
));
diff --git a/src/parser/uri/PhutilURI.php b/src/parser/uri/PhutilURI.php
new file mode 100644
index 0000000..4661341
--- /dev/null
+++ b/src/parser/uri/PhutilURI.php
@@ -0,0 +1,157 @@
+<?php
+
+/*
+ * Copyright 2011 Facebook, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+final class PhutilURI {
+
+ private $protocol;
+ private $domain;
+ private $port;
+ private $path;
+ private $query = array();
+ private $fragment;
+
+ public function __construct($uri) {
+ $parts = $this->parseURI($uri);
+ if ($parts) {
+ $this->protocol = $parts[1];
+ $this->domain = $parts[2];
+ $this->port = $parts[3];
+ $this->path = $parts[4];
+ parse_str($parts[5], $this->query);
+ $this->fragment = $parts[6];
+ }
+ }
+
+ private static function parseURI($uri) {
+ // NOTE: We allow "+" in the protocol for "svn+ssh" and similar.
+ $protocol = '([\w+]+):\/\/';
+ $domain = '([a-zA-Z0-9\.\-_]*)';
+ $port = '(?::(\d+))?';
+ $path = '((?:\/|^)[^#?]*)?';
+ $query = '(?:\?([^#]*))?';
+ $anchor = '(?:#(.*))?';
+
+ $regexp = '/^(?:'.$protocol.$domain.$port.')?'.$path.$query.$anchor.'$/S';
+
+ $matches = null;
+ $ok = preg_match($regexp, $uri, $matches);
+ if ($ok) {
+ return array_pad($matches, 7, null);
+ }
+
+ return null;
+ }
+
+ public function __toString() {
+ $prefix = null;
+ if ($this->protocol || $this->domain || $this->port) {
+ $protocol = nonempty($this->protocol, 'http');
+ $prefix = $protocol.'://'.$this->domain;
+ if ($this->port) {
+ $prefix .= ':'.$this->port;
+ }
+ }
+
+ if ($this->query) {
+ $query = '?'.http_build_query($this->query);
+ } else {
+ $query = null;
+ }
+
+ if (strlen($this->getFramgent())) {
+ $fragment = '#'.$this->getFragment();
+ } else {
+ $fragment = null;
+ }
+
+ return $prefix.$this->getPath().$query.$fragment;
+ }
+
+ public function setQueryParam($key, $value) {
+ if ($value === null) {
+ unset($this->query[$key]);
+ } else {
+ $this->query[$key] = $value;
+ }
+ return $this;
+ }
+
+ public function setQueryParams(array $params) {
+ $this->query = $params;
+ return $this;
+ }
+
+ public function getQueryParams() {
+ return $this->query;
+ }
+
+ public function setProtocol($protocol) {
+ $this->protocol = $protocol;
+ return $this;
+ }
+ public function getProtocol() {
+ return $this->protocol;
+ }
+
+ public function setDomain($domain) {
+ $this->domain = $domain;
+ return $this;
+ }
+
+ public function getDomain() {
+ return $this->domain;
+ }
+
+ public function setPort($port) {
+ $this->port = $port;
+ return $this;
+ }
+ public function getPort() {
+ return $this->port;
+ }
+
+ public function setPath($path) {
+ $this->path = $path;
+ return $this;
+ }
+
+ public function getPath() {
+ return $this->path;
+ }
+
+ public function setFragment($fragment) {
+ $this->fragment = $fragment;
+ return $this;
+ }
+
+ public function getFragment() {
+ return $this->fragment;
+ }
+
+ public function alter($key, $value) {
+ $altered = clone $this;
+ if ($value !== null) {
+ $altered->addQueryData($key, $value);
+ } else {
+ $altered->removeQueryData($key);
+ }
+ return $altered;
+ }
+
+}
+