dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Messages collected above the form are meant to live as boxed messages"
[lhc/web/wiklou.git]
/
includes
/
api
/
ApiBase.php
diff --git
a/includes/api/ApiBase.php
b/includes/api/ApiBase.php
index
0cd9806
..
7518008
100644
(file)
--- a/
includes/api/ApiBase.php
+++ b/
includes/api/ApiBase.php
@@
-992,7
+992,7
@@
abstract class ApiBase extends ContextSource {
return;
}
return;
}
- $queryValues = $this->getRequest()->getQueryValues();
+ $queryValues = $this->getRequest()->getQueryValues
Only
();
$badParams = [];
foreach ( $params as $param ) {
if ( $prefix !== 'noprefix' ) {
$badParams = [];
foreach ( $params as $param ) {
if ( $prefix !== 'noprefix' ) {
@@
-1585,6
+1585,7
@@
abstract class ApiBase extends ContextSource {
'integeroutofrange',
[ 'min' => $min, 'max' => $max, 'botMax' => $botMax ?: $max ]
);
'integeroutofrange',
[ 'min' => $min, 'max' => $max, 'botMax' => $botMax ?: $max ]
);
+ // @phan-suppress-next-line PhanTypeMismatchArgument
$this->warnOrDie( $msg, $enforceLimits );
$value = $min;
}
$this->warnOrDie( $msg, $enforceLimits );
$value = $min;
}
@@
-1606,6
+1607,7
@@
abstract class ApiBase extends ContextSource {
'integeroutofrange',
[ 'min' => $min, 'max' => $max, 'botMax' => $botMax ?: $max ]
);
'integeroutofrange',
[ 'min' => $min, 'max' => $max, 'botMax' => $botMax ?: $max ]
);
+ // @phan-suppress-next-line PhanTypeMismatchArgument
$this->warnOrDie( $msg, $enforceLimits );
$value = $botMax;
}
$this->warnOrDie( $msg, $enforceLimits );
$value = $botMax;
}
@@
-1616,6
+1618,7
@@
abstract class ApiBase extends ContextSource {
'integeroutofrange',
[ 'min' => $min, 'max' => $max, 'botMax' => $botMax ?: $max ]
);
'integeroutofrange',
[ 'min' => $min, 'max' => $max, 'botMax' => $botMax ?: $max ]
);
+ // @phan-suppress-next-line PhanTypeMismatchArgument
$this->warnOrDie( $msg, $enforceLimits );
$value = $max;
}
$this->warnOrDie( $msg, $enforceLimits );
$value = $max;
}
@@
-2022,6
+2025,7
@@
abstract class ApiBase extends ContextSource {
*/
public function dieWithException( $exception, array $options = [] ) {
$this->dieWithError(
*/
public function dieWithException( $exception, array $options = [] ) {
$this->dieWithError(
+ // @phan-suppress-next-line PhanTypeMismatchArgument
$this->getErrorFormatter()->getMessageFromException( $exception, $options )
);
}
$this->getErrorFormatter()->getMessageFromException( $exception, $options )
);
}
@@
-2464,6
+2468,7
@@
abstract class ApiBase extends ContextSource {
if ( $m ) {
$m = new ApiHelpParamValueMessage(
$value,
if ( $m ) {
$m = new ApiHelpParamValueMessage(
$value,
+ // @phan-suppress-next-line PhanTypeMismatchArgument
[ $m->getKey(), 'api-help-param-no-description' ],
$m->getParams(),
isset( $deprecatedValues[$value] )
[ $m->getKey(), 'api-help-param-no-description' ],
$m->getParams(),
isset( $deprecatedValues[$value] )