mirror of
https://we.phorge.it/source/arcanist.git
synced 2024-11-26 16:52:40 +01:00
(stable) Promote 2021 Week 7
This commit is contained in:
commit
faca82a3d5
2 changed files with 8 additions and 3 deletions
|
@ -29,7 +29,7 @@ final class ArcanistGoLintLinter extends ArcanistExternalLinter {
|
|||
public function getInstallInstructions() {
|
||||
return pht(
|
||||
'Install Golint using `%s`.',
|
||||
'go get github.com/golang/lint/golint');
|
||||
'go get -u golang.org/x/lint/golint');
|
||||
}
|
||||
|
||||
public function shouldExpectCommandErrors() {
|
||||
|
|
|
@ -876,14 +876,19 @@ function array_mergev(array $arrayv) {
|
|||
if (!is_array($item)) {
|
||||
throw new InvalidArgumentException(
|
||||
pht(
|
||||
'Expected all items passed to `%s` to be arrays, but '.
|
||||
'Expected all items passed to "array_mergev()" to be arrays, but '.
|
||||
'argument with key "%s" has type "%s".',
|
||||
__FUNCTION__.'()',
|
||||
$key,
|
||||
gettype($item)));
|
||||
}
|
||||
}
|
||||
|
||||
// See T13588. In PHP8, "call_user_func_array()" will attempt to use
|
||||
// "unnatural" array keys as named parameters, and then fail because
|
||||
// "array_merge()" does not accept named parameters . Guarantee the list is
|
||||
// a "natural" list to avoid this.
|
||||
$arrayv = array_values($arrayv);
|
||||
|
||||
return call_user_func_array('array_merge', $arrayv);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue