Seb35 has submitted this change and it was merged. Change subject: Minor maintenance ......................................................................
Minor maintenance Code: * An inherited method did not have the same signature. Code doc: * Fixed the some doc issues. Change-Id: Iaf6589f166678387e8fa7567d73083540a1d0ac9 --- M .gitignore M src/MediaWikiFarm.php M tests/perfs/MediaWikiFarmTestPerfs.php 3 files changed, 9 insertions(+), 10 deletions(-) Approvals: Seb35: Verified; Looks good to me, approved diff --git a/.gitignore b/.gitignore index 67b3c9f..49fc920 100644 --- a/.gitignore +++ b/.gitignore @@ -9,15 +9,12 @@ /node_modules /vendor -# Web access for multiversion farms -# You can put e.g. dedicated 404 error pages in addition of entry points -# If you want to version-control this subdirectory with git, you can – in this case -# add /index.php and others in its .gitignore to avoid double version-control.) -/www - # Tests /tests/phpunit/data/config/versions.php /tests/phpunit/data/config/varwikiversions.php /tests/phpunit/data/config/deployments.php /tests/phpunit/data/config/testdeploymentsfarmversions.php /tests/perfs/results + +# Compiled code documentation +/docs/code diff --git a/src/MediaWikiFarm.php b/src/MediaWikiFarm.php index 5a5ae9e..0b24d82 100644 --- a/src/MediaWikiFarm.php +++ b/src/MediaWikiFarm.php @@ -1255,7 +1255,7 @@ * @codeCoverageIgnore * * @param SiteConfiguration $wgConf SiteConfiguration object. - * @param string $dbName Database name. + * @param string $wikiID Database name. * @return array */ function SiteConfigurationSiteParamsCallback( $wgConf, $wikiID ) { @@ -1439,7 +1439,7 @@ * Set a wiki property and replace placeholders (property name version). * * @param string $name Name of the property. - * @param bool This variable is mandatory. + * @param bool $mandatory This variable is mandatory. * @return void * @throws MWFConfigurationException When the variable is mandatory and missing. * @throws InvalidArgumentException @@ -1714,6 +1714,7 @@ * @mediawikifarm-idempotent * @SuppressWarning(PHPMD.StaticAccess) * + * @param array $array1 First array. * @return array */ static function arrayMerge( $array1 /* ... */ ) { diff --git a/tests/perfs/MediaWikiFarmTestPerfs.php b/tests/perfs/MediaWikiFarmTestPerfs.php index 23f2f0a..a2b48da 100644 --- a/tests/perfs/MediaWikiFarmTestPerfs.php +++ b/tests/perfs/MediaWikiFarmTestPerfs.php @@ -162,13 +162,14 @@ * * This function is very similar to its parent but is performance-spied. * + * @param bool $force Whether to force loading in $this->configuration even if there is a LocalSettings.php * @return void. */ - function getMediaWikiConfig() { + function getMediaWikiConfig( $force = false ) { MediaWikiFarmTestPerfs::startCounter( 'compilation' ); - parent::getMediaWikiConfig(); + parent::getMediaWikiConfig( $force ); MediaWikiFarmTestPerfs::stopCounter( 'compilation' ); } -- To view, visit https://gerrit.wikimedia.org/r/310755 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iaf6589f166678387e8fa7567d73083540a1d0ac9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MediaWikiFarm Gerrit-Branch: master Gerrit-Owner: Seb35 <seb35wikipe...@gmail.com> Gerrit-Reviewer: Seb35 <seb35wikipe...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits