Page MenuHomePhorge
Files F4815725

D26060.1749277005.diff
No OneTemporary
Actions

D26060.1749277005.diff
View Options

diff --git a/src/channel/PhutilChannel.php b/src/channel/PhutilChannel.php
--- a/src/channel/PhutilChannel.php
+++ b/src/channel/PhutilChannel.php
@@ -91,7 +91,7 @@
* @{method:waitForActivity}.
*
* @param list<PhutilChannel> $channels A list of channels to wait for.
- * @param dict $options (optional) Options, see above.
+ * @param array $options (optional) Options, see above.
* @return void
*
* @task wait
@@ -121,7 +121,7 @@
*
* @param list<PhutilChannel> $reads List of channels to wait for reads on.
* @param list<PhutilChannel> $writes List of channels to wait for writes on.
- * @param dict $options (optional) Options, see above.
+ * @param array $options (optional) Options, see above.
* @return void
*
* @task wait
diff --git a/src/error/PhutilErrorHandler.php b/src/error/PhutilErrorHandler.php
--- a/src/error/PhutilErrorHandler.php
+++ b/src/error/PhutilErrorHandler.php
@@ -380,7 +380,7 @@
*
* @param string $event Event type constant.
* @param wild $value Event value.
- * @param dict $metadata Event metadata.
+ * @param array $metadata Event metadata.
* @return void
* @task internal
*/
diff --git a/src/error/phlog.php b/src/error/phlog.php
--- a/src/error/phlog.php
+++ b/src/error/phlog.php
@@ -58,7 +58,7 @@
* @param wild $value The event value, like the Exception object for an
* exception event, an error string for an error event, or some
* user object for user messages.
- * @param dict $metadata A dictionary of metadata about the event. The keys
+ * @param array $metadata A dictionary of metadata about the event. The keys
* 'file', 'line' and 'trace' are always available. Other keys
* may be present, depending on the event type.
* @return void
diff --git a/src/filesystem/PhutilDeferredLog.php b/src/filesystem/PhutilDeferredLog.php
--- a/src/filesystem/PhutilDeferredLog.php
+++ b/src/filesystem/PhutilDeferredLog.php
@@ -85,7 +85,7 @@
* When the log is written, the "%T" and "%u" variables will be replaced with
* the values you provide.
*
- * @param dict $map Map of variables to values.
+ * @param array $map Map of variables to values.
* @return $this
* @task log
*/
diff --git a/src/future/exec/ExecFuture.php b/src/future/exec/ExecFuture.php
--- a/src/future/exec/ExecFuture.php
+++ b/src/future/exec/ExecFuture.php
@@ -909,7 +909,7 @@
/**
* Execute `proc_get_status()`, but avoid pitfalls.
*
- * @return dict Process status.
+ * @return array Process status.
* @task internal
*/
private function procGetStatus() {
diff --git a/src/lexer/PhutilLexer.php b/src/lexer/PhutilLexer.php
--- a/src/lexer/PhutilLexer.php
+++ b/src/lexer/PhutilLexer.php
@@ -87,7 +87,7 @@
* Return a set of rules for this lexer. See description in
* @{class:PhutilLexer}.
*
- * @return dict Lexer rules.
+ * @return array Lexer rules.
* @task lexerimpl
*/
abstract protected function getRawRules();
diff --git a/src/lint/ArcanistLintMessage.php b/src/lint/ArcanistLintMessage.php
--- a/src/lint/ArcanistLintMessage.php
+++ b/src/lint/ArcanistLintMessage.php
@@ -184,7 +184,7 @@
}
/**
- * @param dict $locations Keys 'path', 'line', 'char', 'original'.
+ * @param array $locations Keys 'path', 'line', 'char', 'original'.
*/
public function setOtherLocations(array $locations) {
assert_instances_of($locations, 'array');
diff --git a/src/lint/engine/ArcanistLintEngine.php b/src/lint/engine/ArcanistLintEngine.php
--- a/src/lint/engine/ArcanistLintEngine.php
+++ b/src/lint/engine/ArcanistLintEngine.php
@@ -290,7 +290,9 @@
}
/**
- * @param dict<string path, dict<string version, list<dict message>>>
+ * @param array<string,array<string,array<string>>>
+ * $results Array of format <string path, array<string version,
+ * list<array message>>>
* $results
* @return $this
*/
diff --git a/src/lint/linter/ArcanistScriptAndRegexLinter.php b/src/lint/linter/ArcanistScriptAndRegexLinter.php
--- a/src/lint/linter/ArcanistScriptAndRegexLinter.php
+++ b/src/lint/linter/ArcanistScriptAndRegexLinter.php
@@ -324,7 +324,7 @@
/**
* Get the line and character of the message from the regex match.
*
- * @param dict $match Captured groups from regex.
+ * @param array $match Captured groups from regex.
* @param string $path
* @return pair<int|null,int|null> Line and character of the message.
*
@@ -363,7 +363,7 @@
* a nonempty severity name group like 'error', or a group called 'severity'
* with a valid name.
*
- * @param dict $match Captured groups from regex.
+ * @param array $match Captured groups from regex.
* @return const @{class:ArcanistLintSeverity} constant.
*
* @task parse
diff --git a/src/moduleutils/PhutilLibraryMapBuilder.php b/src/moduleutils/PhutilLibraryMapBuilder.php
--- a/src/moduleutils/PhutilLibraryMapBuilder.php
+++ b/src/moduleutils/PhutilLibraryMapBuilder.php
@@ -152,7 +152,7 @@
/**
* Load the library symbol cache, if it exists and is readable and valid.
*
- * @return dict Map of content hashes to cache of output from
+ * @return array Map of content hashes to cache of output from
* `extract-symbols.php`.
*
* @task symbol
@@ -188,8 +188,8 @@
/**
* Write a symbol map to disk cache.
*
- * @param dict $symbol_map Symbol map of relative paths to symbols.
- * @param dict $source_map Source map (like @{method:loadSourceFileMap}).
+ * @param array $symbol_map Symbol map of relative paths to symbols.
+ * @param array $source_map Source map (like @{method:loadSourceFileMap}).
* @return void
*
* @task symbol
@@ -268,7 +268,7 @@
* // ...
* );
*
- * @return dict Map of library-relative paths to content hashes.
+ * @return array Map of library-relative paths to content hashes.
* @task source
*/
private function loadSourceFileMap() {
@@ -321,8 +321,8 @@
* Convert the symbol analysis of all the source files in the library into
* a library map.
*
- * @param dict $symbol_map Symbol analysis of all source files.
- * @return dict Library map.
+ * @param array $symbol_map Symbol analysis of all source files.
+ * @return array Library map.
* @task source
*/
private function buildLibraryMap(array $symbol_map) {
@@ -381,7 +381,7 @@
/**
* Write a finalized library map.
*
- * @param dict $library_map Library map structure to write.
+ * @param array $library_map Library map structure to write.
* @return void
*
* @task source
diff --git a/src/parser/PhutilJSON.php b/src/parser/PhutilJSON.php
--- a/src/parser/PhutilJSON.php
+++ b/src/parser/PhutilJSON.php
@@ -16,7 +16,7 @@
* Encode an object in JSON and pretty-print it. This generates a valid JSON
* object with human-readable whitespace and indentation.
*
- * @param dict $object An object to encode in JSON.
+ * @param array $object An object to encode in JSON.
* @return string Pretty-printed object representation.
*/
public function encodeFormatted($object) {
@@ -41,7 +41,7 @@
/**
* Pretty-print a JSON object.
*
- * @param dict $object Object to format.
+ * @param array $object Object to format.
* @param int $depth Current depth, for indentation.
* @return string Pretty-printed value.
* @task internal
@@ -115,7 +115,7 @@
/**
* Pretty-print a JSON value.
*
- * @param dict $value Value to format.
+ * @param array $value Value to format.
* @param int $depth Current depth, for indentation.
* @return string Pretty-printed value.
* @task internal
diff --git a/src/parser/PhutilSimpleOptions.php b/src/parser/PhutilSimpleOptions.php
--- a/src/parser/PhutilSimpleOptions.php
+++ b/src/parser/PhutilSimpleOptions.php
@@ -20,7 +20,7 @@
/**
- * Convert a simple option list into a dict. For example:
+ * Convert a simple option list into a dictionary array. For example:
*
* legs=4, eyes=2
*
@@ -32,7 +32,7 @@
* );
*
* @param string $input Input option list.
- * @return dict Parsed dictionary.
+ * @return array Parsed dictionary.
* @task parse
*/
public function parse($input) {
@@ -119,7 +119,7 @@
/**
- * Convert a dictionary into a simple option list. For example:
+ * Convert a dictionary array into a simple option list. For example:
*
* array(
* 'legs' => '4',
@@ -130,7 +130,7 @@
*
* legs=4, eyes=2
*
- * @param dict $options Input dictionary.
+ * @param array $options Input dictionary.
* @param string $escape (optional) Additional characters to escape.
* @return string Unparsed option list.
*/
diff --git a/src/parser/argument/PhutilArgumentSpecification.php b/src/parser/argument/PhutilArgumentSpecification.php
--- a/src/parser/argument/PhutilArgumentSpecification.php
+++ b/src/parser/argument/PhutilArgumentSpecification.php
@@ -34,7 +34,7 @@
* wildcard setWildcard()
* repeat setRepeatable()
*
- * @param dict $spec Dictionary of quick parameter definitions.
+ * @param array $spec Dictionary of quick parameter definitions.
* @return PhutilArgumentSpecification Constructed argument specification.
*/
public static function newQuickSpec(array $spec) {
diff --git a/src/repository/api/ArcanistGitAPI.php b/src/repository/api/ArcanistGitAPI.php
--- a/src/repository/api/ArcanistGitAPI.php
+++ b/src/repository/api/ArcanistGitAPI.php
@@ -1056,7 +1056,7 @@
/**
* Returns names of all the branches in the current repository.
*
- * @return list<dict<string, string>> Dictionary of branch information.
+ * @return list<array<string, string>> Dictionary of branch information.
*/
private function getAllBranches() {
$field_list = array(
diff --git a/src/repository/parser/ArcanistMercurialParser.php b/src/repository/parser/ArcanistMercurialParser.php
--- a/src/repository/parser/ArcanistMercurialParser.php
+++ b/src/repository/parser/ArcanistMercurialParser.php
@@ -18,7 +18,7 @@
* particular, this will parse copy sources as per "hg status -C".
*
* @param string $stdout The stdout from running an "hg status" command.
- * @return dict Map of paths to status dictionaries.
+ * @return array Map of paths to status dictionaries.
* @task parse
*/
public static function parseMercurialStatusDetails($stdout) {
@@ -97,7 +97,7 @@
* @{method:parseMercurialStatusDetails}.
*
* @param string $stdout The stdout from running an "hg status" command.
- * @return dict Map of paths to ArcanistRepositoryAPI status flags.
+ * @return array Map of paths to ArcanistRepositoryAPI status flags.
* @task parse
*/
public static function parseMercurialStatus($stdout) {
diff --git a/src/symbols/PhutilSymbolLoader.php b/src/symbols/PhutilSymbolLoader.php
--- a/src/symbols/PhutilSymbolLoader.php
+++ b/src/symbols/PhutilSymbolLoader.php
@@ -161,9 +161,9 @@
* Execute the query and select matching symbols, then load them so they can
* be used.
*
- * @return dict A dictionary of matching symbols. See top-level class
- * documentation for details. These symbols will be loaded
- * and available.
+ * @return array A dictionary of matching symbols. See top-level class
+ * documentation for details. These symbols will be loaded
+ * and available.
*
* @task load
*/
@@ -331,8 +331,8 @@
* of the symbols and don't plan to use them; otherwise, use
* @{method:selectAndLoadSymbols}.
*
- * @return dict A dictionary of matching symbols. See top-level class
- * documentation for details.
+ * @return array A dictionary of matching symbols. See top-level class
+ * documentation for details.
*
* @task load
*/
diff --git a/src/utils/AbstractDirectedGraph.php b/src/utils/AbstractDirectedGraph.php
--- a/src/utils/AbstractDirectedGraph.php
+++ b/src/utils/AbstractDirectedGraph.php
@@ -56,8 +56,8 @@
* this requirement.
*
* @param list $nodes A list of nodes.
- * @return dict A map of nodes to the nodes reachable along their edges.
- * There must be an entry for each node you were provided.
+ * @return array A map of nodes to the nodes reachable along their edges.
+ * There must be an entry for each node you were provided.
* @task build
*/
abstract protected function loadEdges(array $nodes);
@@ -68,7 +68,7 @@
* edges that a user is trying to create here, or the initial set of edges
* you know about.
*
- * @param dict $nodes A map of nodes to the nodes reachable along their
+ * @param array $nodes A map of nodes to the nodes reachable along their
* edges
* @return $this
* @task build
diff --git a/src/utils/utils.php b/src/utils/utils.php
--- a/src/utils/utils.php
+++ b/src/utils/utils.php
@@ -136,7 +136,7 @@
* Use a string like 'getID' to use the result
* of calling the named method as each object's key, or
* `null` to preserve the original keys.
- * @return dict A dictionary with keys and values derived according
+ * @return array A dictionary with keys and values derived according
* to whatever you passed as `$method` and `$key_method`.
*/
function mpull(array $list, $method, $key_method = null) {
@@ -210,7 +210,7 @@
* 'id' to use the result of accessing the named property
* as each object's key, or `null` to preserve the
* original keys.
- * @return dict A dictionary with keys and values derived according
+ * @return array A dictionary with keys and values derived according
* to whatever you passed as `$property` and
* `$key_property`.
*/
@@ -260,7 +260,7 @@
* appear in the result array. Use a scalar to select
* that index from each array, or null to preserve the
* array keys.
- * @return dict A dictionary with keys and values derived according
+ * @return array A dictionary with keys and values derived according
* to whatever you passed for `$index` and `$key_index`.
*/
function ipull(array $list, $index, $key_index = null) {
@@ -309,7 +309,7 @@
* placed into.
* @param string $methods,... Zero or more additional method names, to
* subgroup the groups.
- * @return dict Dictionary mapping distinct method returns to lists of
+ * @return array Dictionary mapping distinct method returns to lists of
* all objects which returned that value.
*/
function mgroup(array $list, $by /* , ... */) {
@@ -349,7 +349,7 @@
* determine which group it should be placed into.
* @param string $methods,... Zero or more additional indexes names, to
* subgroup the groups.
- * @return dict Dictionary mapping distinct index values to lists of
+ * @return array Dictionary mapping distinct index values to lists of
* all objects which had that value at the index.
*/
function igroup(array $list, $by /* , ... */) {
@@ -603,9 +603,9 @@
* uses: either reducing a large dictionary to a smaller one, or changing the
* key order on an existing dictionary.
*
- * @param dict $dict Dictionary of key-value pairs to select from.
+ * @param array $dict Dictionary of key-value pairs to select from.
* @param list $keys List of keys to select.
- * @return dict Dictionary of only those key-value pairs where the key was
+ * @return array Dictionary of only those key-value pairs where the key was
* present in the list of keys to select. Ordering is
* determined by the list order.
*/
@@ -958,7 +958,7 @@
* $result = array_fuse($list);
*
* @param list $list (optional) List of scalars.
- * @return dict Dictionary with inputs mapped to themselves.
+ * @return array Dictionary with inputs mapped to themselves.
*/
function array_fuse(?array $list = null) {
if ($list) {
diff --git a/src/workflow/ArcanistDiffWorkflow.php b/src/workflow/ArcanistDiffWorkflow.php
--- a/src/workflow/ArcanistDiffWorkflow.php
+++ b/src/workflow/ArcanistDiffWorkflow.php
@@ -1803,7 +1803,7 @@
* errors (e.g., if the user typed a reviewer name incorrectly) and a
* summary of the commits themselves.
*
- * @param dict $local Local commit information.
+ * @param array $local Local commit information.
* @return list Complex output, see summary.
* @task message
*/
diff --git a/src/workflow/ArcanistWorkflow.php b/src/workflow/ArcanistWorkflow.php
--- a/src/workflow/ArcanistWorkflow.php
+++ b/src/workflow/ArcanistWorkflow.php
@@ -407,7 +407,7 @@
* NOTE: You can not call this method after calling
* @{method:authenticateConduit}.
*
- * @param dict $credentials A credential dictionary, see
+ * @param array $credentials A credential dictionary, see
* @{method:authenticateConduit}.
* @return $this
* @task conduit

File Metadata

Mime Type
text/plain
Expires
Sat, Jun 7, 06:16 (3 h, 12 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1754193
Default Alt Text
D26060.1749277005.diff (17 KB)

Event Timeline

Content licensed under Creative Commons Attribution-ShareAlike 4.0 (CC-BY-SA) unless otherwise noted; code licensed under Apache 2.0 or other open source licenses. · CC BY-SA 4.0 · Apache 2.0