Ladsgroup has uploaded a new change for review. https://gerrit.wikimedia.org/r/311094
Change subject: LBFactory -> LBFactoryMW in docs ...................................................................... LBFactory -> LBFactoryMW in docs Change-Id: I38de32b19ffdf2431ea556fbbab61cec2dfee6be --- M client/config/WikibaseClient.example.php M client/includes/WikibaseClient.php M docs/options.wiki M lib/config/WikibaseLib.default.php M lib/includes/Store/Sql/EntityChangeLookup.php M lib/includes/Store/Sql/PropertyInfoTable.php M lib/includes/Store/Sql/SiteLinkTable.php M lib/includes/Store/Sql/SqlEntityInfoBuilder.php M lib/includes/Store/Sql/SqlEntityInfoBuilderFactory.php 9 files changed, 10 insertions(+), 10 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/94/311094/1 diff --git a/client/config/WikibaseClient.example.php b/client/config/WikibaseClient.example.php index 1a32481..7afbf5c 100644 --- a/client/config/WikibaseClient.example.php +++ b/client/config/WikibaseClient.example.php @@ -49,7 +49,7 @@ // Database name of the repository, for direct access from the client. // repoDatabase and changesDatabase will generally be the same. - // This requires the given database name to be known to LBFactory, see + // This requires the given database name to be known to LBFactoryMW, see // $wgLBFactoryConf below. $wgWBClientSettings['repoDatabase'] = "repo"; diff --git a/client/includes/WikibaseClient.php b/client/includes/WikibaseClient.php index e790802..d139a09 100644 --- a/client/includes/WikibaseClient.php +++ b/client/includes/WikibaseClient.php @@ -501,7 +501,7 @@ if ( $this->store === null ) { // NOTE: $repoDatabase is null per default, meaning no direct access to the repo's // database. If $repoDatabase is false, the local wiki IS the repository. Otherwise, - // $repoDatabase needs to be a logical database name that LBFactory understands. + // $repoDatabase needs to be a logical database name that LBFactoryMW understands. $repoDatabase = $this->settings->getSetting( 'repoDatabase' ); $this->store = new DirectSqlStore( $this->getEntityChangeFactory(), diff --git a/docs/options.wiki b/docs/options.wiki index 3c0841c..a8cd318 100644 --- a/docs/options.wiki +++ b/docs/options.wiki @@ -9,7 +9,7 @@ === Basic Settings === ;entityNamespaces: Defines which kind of entity is managed in which namespace; this is given as an associative array mapping entity types such as <code>'item'</code> to namespace IDs. This setting is required for each kind of entity that should be supported. -;changesDatabase: The database that changes are recorded to for processing by clients. This must be set to a symbolic database identifier that MediaWiki's LBFactory class understands; <code>false</code> means that the wiki's own database shall be used. '''Note''' that on the client, this setting should usually be the same as the <code>repoDatabase</code> setting. +;changesDatabase: The database that changes are recorded to for processing by clients. This must be set to a symbolic database identifier that MediaWiki's LBFactoryMW class understands; <code>false</code> means that the wiki's own database shall be used. '''Note''' that on the client, this setting should usually be the same as the <code>repoDatabase</code> setting. ;siteLinkGroups: The site groups to use in sitelinks. Must correspond to a value used to give the site group in the MediaWiki <code>sites</code> table. Default is array( "wikipedia" ). This defines which groups of sites can be linked to Wikibase items. '''Note''' that this setting replaces the old ''siteLinkGroup'' setting, which only allowed for a single group. ;specialSiteLinkGroups: This maps one or more site groups into a single "special" group. This is useful if sites from multiple site groups should be shown in a single "special" section on item pages, instead of one section per site group. To show these site-groups you have to add the group "special" to the '''siteLinkGroups''' setting (see above). ;localClientDatabases: An array of locally accessible client databases, for use by the <code>dispatchChanges.php</code> script. This setting determines which wikis changes are pushed to directly. It must be given either as an associative array, mapping global site IDs to logical database names, or, of the database names are the same as the site IDs, as a list of databases. The default is an empty array, indicating no local client databases. @@ -77,7 +77,7 @@ ;siteGroup: This site's site group (e.g. <code>'wikipedia'</code> or <code>'wikivoyage'</code>) as used in the sites table. The setting is optional and falls back to site store lookup. For performance reasons, it may be desireable to set this explicitly to avoid lookups. ;repoSiteId: Site id of connected repository wiki. Default is to assume client and repo, so this setting defaults to siteGlobalID. ;repoSiteName: Site name of the connected repository wiki. Default is to assume client and repo are same wiki, so defaults to global $wgSitename setting. If not the same wiki, defaults to 'Wikidata'. This setting can also be set to an i18n message key and will be handled as a message, if the message key exists so that the repo site name can be translatable. -;repoDatabase: The logical name of the repository database, in a form that LBFactory can understand. If not <code>null</code>, the client wiki will access the repository's database directly, instead of locally caching information received via change notifications. Default: <node>null</code>. Note that <code>false</code> would mean "this wiki's database"! '''Note:''' this is currently required to be not <code>null</code>, since local caching is not fully implemented. +;repoDatabase: The logical name of the repository database, in a form that LBFactoryMW can understand. If not <code>null</code>, the client wiki will access the repository's database directly, instead of locally caching information received via change notifications. Default: <node>null</code>. Note that <code>false</code> would mean "this wiki's database"! '''Note:''' this is currently required to be not <code>null</code>, since local caching is not fully implemented. // default for repo items in main namespace ;repoNamespaces: An array telling the client wiki which namespaces on the repository are used for which kind of entity. This is given as an associative array mapping entity type IDs such as Item::ENTITY_TYPE, to namespace names. This information is used when constructing links to entities on the repository. Default: <poem> diff --git a/lib/config/WikibaseLib.default.php b/lib/config/WikibaseLib.default.php index 12b35ed..daa4846 100644 --- a/lib/config/WikibaseLib.default.php +++ b/lib/config/WikibaseLib.default.php @@ -24,7 +24,7 @@ 'specialSiteLinkGroups' => [], - // local by default. Set to something LBFactory understands. + // local by default. Set to something LBFactoryMW understands. 'changesDatabase' => false, // list of logical database names of local client wikis. diff --git a/lib/includes/Store/Sql/EntityChangeLookup.php b/lib/includes/Store/Sql/EntityChangeLookup.php index a795989..a02a7f5 100644 --- a/lib/includes/Store/Sql/EntityChangeLookup.php +++ b/lib/includes/Store/Sql/EntityChangeLookup.php @@ -41,7 +41,7 @@ * @param EntityChangeFactory $entityChangeFactory * @param EntityIdParser $entityIdParser * @param string|bool $wiki The target wiki's name. This must be an ID - * that LBFactory can understand. + * that LBFactoryMW can understand. */ public function __construct( EntityChangeFactory $entityChangeFactory, diff --git a/lib/includes/Store/Sql/PropertyInfoTable.php b/lib/includes/Store/Sql/PropertyInfoTable.php index aa1916e..cebc32a 100644 --- a/lib/includes/Store/Sql/PropertyInfoTable.php +++ b/lib/includes/Store/Sql/PropertyInfoTable.php @@ -32,7 +32,7 @@ /** * @param bool $isReadonly Whether the table can be modified. * @param string|bool $wiki The wiki's database to connect to. - * Must be a value LBFactory understands. Defaults to false, which is the local wiki. + * Must be a value LBFactoryMW understands. Defaults to false, which is the local wiki. * * @throws InvalidArgumentException */ diff --git a/lib/includes/Store/Sql/SiteLinkTable.php b/lib/includes/Store/Sql/SiteLinkTable.php index 84d68e2..ca0e965 100644 --- a/lib/includes/Store/Sql/SiteLinkTable.php +++ b/lib/includes/Store/Sql/SiteLinkTable.php @@ -41,7 +41,7 @@ * @param string $table The table to use for the sitelinks * @param bool $readonly Whether the table can be modified. * @param string|bool $wiki The wiki's database to connect to. - * Must be a value LBFactory understands. Defaults to false, which is the local wiki. + * Must be a value LBFactoryMW understands. Defaults to false, which is the local wiki. * * @throws MWException */ diff --git a/lib/includes/Store/Sql/SqlEntityInfoBuilder.php b/lib/includes/Store/Sql/SqlEntityInfoBuilder.php index 0fe4b65..000ef0f 100644 --- a/lib/includes/Store/Sql/SqlEntityInfoBuilder.php +++ b/lib/includes/Store/Sql/SqlEntityInfoBuilder.php @@ -123,7 +123,7 @@ * @param EntityIdComposer $entityIdComposer * @param EntityId[] $ids * @param string|bool $wiki The wiki's database to connect to. - * Must be a value LBFactory understands. Defaults to false, which is the local wiki. + * Must be a value LBFactoryMW understands. Defaults to false, which is the local wiki. * * @throws InvalidArgumentException */ diff --git a/lib/includes/Store/Sql/SqlEntityInfoBuilderFactory.php b/lib/includes/Store/Sql/SqlEntityInfoBuilderFactory.php index 28f113a..850cd71 100644 --- a/lib/includes/Store/Sql/SqlEntityInfoBuilderFactory.php +++ b/lib/includes/Store/Sql/SqlEntityInfoBuilderFactory.php @@ -40,7 +40,7 @@ * @param EntityIdParser $entityIdParser * @param EntityIdComposer $entityIdComposer * @param string|bool $wiki The wiki's database to connect to. - * Must be a value LBFactory understands. Defaults to false, which is the local wiki. + * Must be a value LBFactoryMW understands. Defaults to false, which is the local wiki. * * @throws InvalidArgumentException */ -- To view, visit https://gerrit.wikimedia.org/r/311094 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I38de32b19ffdf2431ea556fbbab61cec2dfee6be Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Ladsgroup <ladsgr...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits