diff options
author | Max Semenik <maxsem.wiki@gmail.com> | 2018-06-04 23:24:34 -0700 |
---|---|---|
committer | Max Semenik <maxsem.wiki@gmail.com> | 2018-06-04 23:39:04 -0700 |
commit | 8085c58a4b675c0c11c6454bdf15b3ba61022283 (patch) | |
tree | 75dc790c62f18fa21a7139541c4bcd418db94dd7 /includes/changes | |
parent | d5b271a464c97a54a7f4f9ec6d76e54249acef24 (diff) | |
download | mediawikicore-8085c58a4b675c0c11c6454bdf15b3ba61022283.tar.gz mediawikicore-8085c58a4b675c0c11c6454bdf15b3ba61022283.zip |
Replace call_user_func_array(), part 1
Uses new PHP 5.6 syntax like ...parameter unpacking and
calling anything looking like a callback to make the code more readable.
There are much more occurrences but this commit is intentionally limited
to an easily reviewable size.
Change-Id: Idcec077ef3fdf029b632cceafd0150851ad723e3
Diffstat (limited to 'includes/changes')
-rw-r--r-- | includes/changes/CategoryMembershipChange.php | 29 | ||||
-rw-r--r-- | includes/changes/ChangesListBooleanFilter.php | 21 | ||||
-rw-r--r-- | includes/changes/ChangesListStringOptionsFilterGroup.php | 23 |
3 files changed, 32 insertions, 41 deletions
diff --git a/includes/changes/CategoryMembershipChange.php b/includes/changes/CategoryMembershipChange.php index f095b64f8268..a49fb4c727b0 100644 --- a/includes/changes/CategoryMembershipChange.php +++ b/includes/changes/CategoryMembershipChange.php @@ -187,22 +187,19 @@ class CategoryMembershipChange { } /** @var RecentChange $rc */ - $rc = call_user_func_array( - $this->newForCategorizationCallback, - [ - $timestamp, - $categoryTitle, - $user, - $comment, - $pageTitle, - $lastRevId, - $newRevId, - $lastTimestamp, - $bot, - $ip, - $deleted, - $added - ] + $rc = ( $this->newForCategorizationCallback )( + $timestamp, + $categoryTitle, + $user, + $comment, + $pageTitle, + $lastRevId, + $newRevId, + $lastTimestamp, + $bot, + $ip, + $deleted, + $added ); $rc->save(); } diff --git a/includes/changes/ChangesListBooleanFilter.php b/includes/changes/ChangesListBooleanFilter.php index f37ed2dd6dfb..fc37882c02b9 100644 --- a/includes/changes/ChangesListBooleanFilter.php +++ b/includes/changes/ChangesListBooleanFilter.php @@ -206,18 +206,15 @@ class ChangesListBooleanFilter extends ChangesListFilter { return; } - call_user_func_array( - $this->queryCallable, - [ - get_class( $specialPage ), - $specialPage->getContext(), - $dbr, - &$tables, - &$fields, - &$conds, - &$query_options, - &$join_conds - ] + ( $this->queryCallable )( + get_class( $specialPage ), + $specialPage->getContext(), + $dbr, + $tables, + $fields, + $conds, + $query_options, + $join_conds ); } diff --git a/includes/changes/ChangesListStringOptionsFilterGroup.php b/includes/changes/ChangesListStringOptionsFilterGroup.php index 8cd7ba8dea53..e06f0817ba4b 100644 --- a/includes/changes/ChangesListStringOptionsFilterGroup.php +++ b/includes/changes/ChangesListStringOptionsFilterGroup.php @@ -200,19 +200,16 @@ class ChangesListStringOptionsFilterGroup extends ChangesListFilterGroup { sort( $selectedValues ); - call_user_func_array( - $this->queryCallable, - [ - get_class( $specialPage ), - $specialPage->getContext(), - $dbr, - &$tables, - &$fields, - &$conds, - &$query_options, - &$join_conds, - $selectedValues - ] + ( $this->queryCallable )( + get_class( $specialPage ), + $specialPage->getContext(), + $dbr, + $tables, + $fields, + $conds, + $query_options, + $join_conds, + $selectedValues ); } |