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 "Database: Add batching to non-native insertSelect()"
[lhc/web/wiklou.git]
/
includes
/
api
/
ApiErrorFormatter.php
diff --git
a/includes/api/ApiErrorFormatter.php
b/includes/api/ApiErrorFormatter.php
index
183f7e2
..
c637752
100644
(file)
--- a/
includes/api/ApiErrorFormatter.php
+++ b/
includes/api/ApiErrorFormatter.php
@@
-112,7
+112,7
@@
class ApiErrorFormatter {
* Add warnings and errors from a StatusValue object to the result
* @param string|null $modulePath
* @param StatusValue $status
* Add warnings and errors from a StatusValue object to the result
* @param string|null $modulePath
* @param StatusValue $status
- * @param string[] $types 'warning' and/or 'error'
+ * @param string[]
|string
$types 'warning' and/or 'error'
*/
public function addMessagesFromStatus(
$modulePath, StatusValue $status, $types = [ 'warning', 'error' ]
*/
public function addMessagesFromStatus(
$modulePath, StatusValue $status, $types = [ 'warning', 'error' ]
@@
-361,9
+361,8
@@
class ApiErrorFormatter {
* @deprecated Only for backwards compatibility, do not use
* @ingroup API
*/
* @deprecated Only for backwards compatibility, do not use
* @ingroup API
*/
-//
@codingStandardsIgnoreStart
Squiz.Classes.ValidClassName.NotCamelCaps
+//
phpcs:ignore
Squiz.Classes.ValidClassName.NotCamelCaps
class ApiErrorFormatter_BackCompat extends ApiErrorFormatter {
class ApiErrorFormatter_BackCompat extends ApiErrorFormatter {
- // @codingStandardsIgnoreEnd
/**
* @param ApiResult $result Into which data will be added
/**
* @param ApiResult $result Into which data will be added