/**
* Merges all requests parameter + expected values into one
- * @param array $v,... List of arrays, each of which contains exactly two
+ * @param array ...$arrays List of arrays, each of which contains exactly two
* @return array
*/
- protected function merge( /*...*/ ) {
+ protected function merge( ...$arrays ) {
$request = [];
$expected = [];
- foreach ( func_get_args() as $v ) {
- list( $req, $exp ) = $this->validateRequestExpectedPair( $v );
+ foreach ( $arrays as $array ) {
+ list( $req, $exp ) = $this->validateRequestExpectedPair( $array );
$request = array_merge_recursive( $request, $req );
$this->mergeExpected( $expected, $exp );
}
/**
* Checks that the request's result matches the expected results.
* Assumes no rawcontinue and a complete batch.
- * @param array $values Array is a two element array( request, expected_results )
- * @param array $session
+ * @param array $values Array is a two element [ request, expected_results ]
+ * @param array|null $session
* @param bool $appendModule
- * @param User $user
+ * @param User|null $user
*/
protected function check( $values, array $session = null,
$appendModule = false, User $user = null