From 550271e8063bb1ad042e3b4374c7c0837631e609 Mon Sep 17 00:00:00 2001 From: Sam Reed Date: Wed, 6 Oct 2010 21:18:55 +0000 Subject: [PATCH] Explicit class variable definition Parameter hints --- includes/api/ApiMain.php | 1 + includes/api/ApiQuery.php | 5 +++-- includes/api/ApiQueryPageProps.php | 2 ++ includes/api/ApiQueryUserContributions.php | 2 +- includes/api/ApiQueryUsers.php | 2 ++ 5 files changed, 9 insertions(+), 3 deletions(-) diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php index 801ae4c3f2..df830ea1fd 100644 --- a/includes/api/ApiMain.php +++ b/includes/api/ApiMain.php @@ -448,6 +448,7 @@ class ApiMain extends ApiBase { /** * Replace the result data with the information about an exception. * Returns the error code + * @param $e MWException */ protected function substituteResultWithError( $e ) { // Printer may not be initialized if the extractRequestParams() fails for the main module diff --git a/includes/api/ApiQuery.php b/includes/api/ApiQuery.php index 6d73350065..6027818193 100644 --- a/includes/api/ApiQuery.php +++ b/includes/api/ApiQuery.php @@ -44,7 +44,7 @@ class ApiQuery extends ApiBase { private $mPropModuleNames, $mListModuleNames, $mMetaModuleNames; private $mPageSet; - private $params; + private $params, $redirects, $convertTitles; private $mQueryPropModules = array( 'info' => 'ApiQueryInfo', @@ -492,6 +492,7 @@ class ApiQuery extends ApiBase { /** * Create a generator object of the given type and return it * @param $generatorName string Module name + * @return ApiQueryGeneratorBase */ public function newGenerator( $generatorName ) { // Find class that implements requested generator @@ -513,7 +514,7 @@ class ApiQuery extends ApiBase { /** * For generator mode, execute generator, and use its output as new * ApiPageSet - * @param $generator string Module name + * @param $generator ApiQueryGeneratorBase Generator Module * @param $modules array of module objects */ protected function executeGeneratorModule( $generator, $modules ) { diff --git a/includes/api/ApiQueryPageProps.php b/includes/api/ApiQueryPageProps.php index 858f08a1e2..d5fe6ffea8 100644 --- a/includes/api/ApiQueryPageProps.php +++ b/includes/api/ApiQueryPageProps.php @@ -36,6 +36,8 @@ if ( !defined( 'MEDIAWIKI' ) ) { */ class ApiQueryPageProps extends ApiQueryBase { + private $params, $titles, $missing, $everything; + public function __construct( $query, $moduleName ) { parent::__construct( $query, $moduleName, 'pp' ); } diff --git a/includes/api/ApiQueryUserContributions.php b/includes/api/ApiQueryUserContributions.php index 12e5912d6a..e1646838d8 100644 --- a/includes/api/ApiQueryUserContributions.php +++ b/includes/api/ApiQueryUserContributions.php @@ -40,7 +40,7 @@ class ApiQueryContributions extends ApiQueryBase { parent::__construct( $query, $moduleName, 'uc' ); } - private $params; + private $params, $prefixMode, $userprefix, $multiUserMode; private $fld_ids = false, $fld_title = false, $fld_timestamp = false, $fld_comment = false, $fld_parsedcomment = false, $fld_flags = false, $fld_patrolled = false, $fld_tags = false, $fld_size = false; diff --git a/includes/api/ApiQueryUsers.php b/includes/api/ApiQueryUsers.php index 757f4ebf15..d009171ca2 100644 --- a/includes/api/ApiQueryUsers.php +++ b/includes/api/ApiQueryUsers.php @@ -36,6 +36,8 @@ if ( !defined( 'MEDIAWIKI' ) ) { */ class ApiQueryUsers extends ApiQueryBase { + private $tokenFunctions; + public function __construct( $query, $moduleName ) { parent::__construct( $query, $moduleName, 'us' ); } -- 2.20.1