diff options
Diffstat (limited to 'tests/phpunit/includes/api')
5 files changed, 6 insertions, 8 deletions
diff --git a/tests/phpunit/includes/api/ApiBaseTest.php b/tests/phpunit/includes/api/ApiBaseTest.php index 621986971796..6a5603beed4c 100644 --- a/tests/phpunit/includes/api/ApiBaseTest.php +++ b/tests/phpunit/includes/api/ApiBaseTest.php @@ -276,11 +276,11 @@ class ApiBaseTest extends ApiTestCase { * @param string|null $input * @param array $paramSettings * @param mixed $expected + * @param string[] $warnings * @param array $options Key-value pairs: * 'parseLimits': true|false * 'apihighlimits': true|false * 'prefix': true|false - * @param string[] $warnings */ private function doGetParameterFromSettings( $input, $paramSettings, $expected, $warnings, $options = [] diff --git a/tests/phpunit/includes/api/ApiBlockTest.php b/tests/phpunit/includes/api/ApiBlockTest.php index 7911bafb3350..1be5d2935dc5 100644 --- a/tests/phpunit/includes/api/ApiBlockTest.php +++ b/tests/phpunit/includes/api/ApiBlockTest.php @@ -35,8 +35,7 @@ class ApiBlockTest extends ApiTestCase { /** * @param array $extraParams Extra API parameters to pass to doApiRequest - * @param User $blocker User to do the blocking, null to pick - * arbitrarily + * @param User|null $blocker User to do the blocking, null to pick arbitrarily * @return array result of doApiRequest */ private function doBlock( array $extraParams = [], User $blocker = null ) { diff --git a/tests/phpunit/includes/api/ApiParseTest.php b/tests/phpunit/includes/api/ApiParseTest.php index edabd808f747..9892a1879b05 100644 --- a/tests/phpunit/includes/api/ApiParseTest.php +++ b/tests/phpunit/includes/api/ApiParseTest.php @@ -70,7 +70,7 @@ class ApiParseTest extends ApiTestCase { * parser adds around the parsed page. Also asserts that warnings match * the provided $warning. * - * @param string $html Expected HTML + * @param string $expected Expected HTML * @param array $res Returned from doApiRequest() * @param string|null $warnings Exact value of expected warnings, null for * no warnings @@ -83,7 +83,7 @@ class ApiParseTest extends ApiTestCase { * Same as above, but asserts that the HTML matches a regexp instead of a * literal string match. * - * @param string $html Expected HTML + * @param string $expected Expected HTML * @param array $res Returned from doApiRequest() * @param string|null $warnings Exact value of expected warnings, null for * no warnings diff --git a/tests/phpunit/includes/api/ApiStashEditTest.php b/tests/phpunit/includes/api/ApiStashEditTest.php index 520ad7147511..347d987740d5 100644 --- a/tests/phpunit/includes/api/ApiStashEditTest.php +++ b/tests/phpunit/includes/api/ApiStashEditTest.php @@ -32,7 +32,7 @@ class ApiStashEditTest extends ApiTestCase { * * @param array $params Query parameters for API request. All are optional and will have * sensible defaults filled in. To make a parameter actually not passed, set to null. - * @param User $user User to do the request + * @param User|null $user User to do the request * @param string $expectedResult 'stashed', 'editconflict' * @return array */ @@ -107,7 +107,7 @@ class ApiStashEditTest extends ApiTestCase { * * @param string $title Title of page * @param string Content $text Content of edit - * @param User $user User who made edit + * @param User|null $user User who made edit * @return string */ protected function getStashKey( $title = __CLASS__, $text = 'Content', User $user = null ) { diff --git a/tests/phpunit/includes/api/Validator/ApiParamValidatorTest.php b/tests/phpunit/includes/api/Validator/ApiParamValidatorTest.php index 6ca695aec147..33efcedaee14 100644 --- a/tests/phpunit/includes/api/Validator/ApiParamValidatorTest.php +++ b/tests/phpunit/includes/api/Validator/ApiParamValidatorTest.php @@ -621,7 +621,6 @@ class ApiParamValidatorTest extends ApiTestCase { * @dataProvider provideValidateValue * @param mixed $value Value to validate * @param mixed $settings - * @param mixed $value Value to validate * @param mixed $expect Expected value, or an expected ApiUsageException */ public function testValidateValue( $value, $settings, $expect ) : void { |