[MediaWiki-commits] [Gerrit] Re-enable MediaWiki code sniffer rule for empty comments - change (mediawiki...Wikibase)

2015-11-01 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: Re-enable MediaWiki code sniffer rule for empty comments
..


Re-enable MediaWiki code sniffer rule for empty comments

Change-Id: Ib7107c49c081a8a7d67f08892b84cf17e9a08cbd
---
M client/config/WikibaseClient.default.php
M client/config/WikibaseClient.example.php
M client/includes/store/sql/BulkSubscriptionUpdater.php
M phpcs.xml
M repo/config/Wikibase.default.php
M repo/includes/OutputPageJsConfigBuilder.php
M repo/includes/store/sql/WikiPageEntityStore.php
7 files changed, 107 insertions(+), 87 deletions(-)

Approvals:
  Umherirrender: Looks good to me, approved
  JanZerebecki: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/client/config/WikibaseClient.default.php 
b/client/config/WikibaseClient.default.php
index bc2069e..0e3cf71 100644
--- a/client/config/WikibaseClient.default.php
+++ b/client/config/WikibaseClient.default.php
@@ -56,29 +56,37 @@
// Enable in case wbc_entity_usage does not exist or is not yet 
populated.
'useLegacyUsageIndex' => false,
 
-   // Enable in case wb_changes_subscription does not exist (on 
the repo) or is not yet populated.
-   //
-   // @note: if Wikibase Repo and Client are enabled on the same 
wiki, then this only needs
-   // to be set in the repo or can be set the same in both. (repo 
settings override client settings)
+   /**
+* Enable in case wb_changes_subscription does not exist (on 
the repo) or is not yet
+* populated.
+*
+* @note If Wikibase Repo and Client are enabled on the same 
wiki, then this only needs to
+* be set in the repo or can be set the same in both (repo 
settings override client
+* settings).
+*/
'useLegacyChangesSubscription' => false,
 
-   // Prefix to use for cache keys that should be shared among a 
Wikibase Repo instance
-   // and all its clients. This is for things like caching entity 
blobs in memcached.
-   //
-   // The default here assumes Wikibase Repo + Client installed 
together on the same wiki.
-   // For a multiwiki / wikifarm setup, to configure shared caches 
between clients and repo,
-   // this needs to be set to the same value in both client and 
repo wiki settings.
-   //
-   // For Wikidata production, we set it to 
'wikibase-shared/wikidata_1_25wmf24-wikidatawiki',
-   // which is 'wikibase_shared/' + deployment branch name + '-' + 
repo database name,
-   // and have it set in both $wgWBClientSettings and 
$wgWBRepoSettings.
+   /**
+* Prefix to use for cache keys that should be shared among a 
Wikibase Repo instance and all
+* its clients. This is for things like caching entity blobs in 
memcached.
+*
+* The default here assumes Wikibase Repo + Client installed 
together on the same wiki. For
+* a multiwiki / wikifarm setup, to configure shared caches 
between clients and repo, this
+* needs to be set to the same value in both client and repo 
wiki settings.
+*
+* For Wikidata production, we set it to 
'wikibase-shared/wikidata_1_25wmf24-wikidatawiki',
+* which is 'wikibase_shared/' + deployment branch name + '-' + 
repo database name, and have
+* it set in both $wgWBClientSettings and $wgWBRepoSettings.
+*/
'sharedCacheKeyPrefix' => 'wikibase_shared/' . WBL_VERSION . 
'-' . $GLOBALS['wgDBname'],
 
-   // The duration of the object cache, in seconds.
-   //
-   // As with sharedCacheKeyPrefix, this is both client and repo 
setting. On a multiwiki
-   // setup, this should be set to the same value in both the repo 
and clients.
-   // Also note that the setting value in $wgWBClientSettings 
overrides the one here.
+   /**
+* The duration of the object cache, in seconds.
+*
+* As with sharedCacheKeyPrefix, this is both client and repo 
setting. On a multiwiki setup,
+* this should be set to the same value in both the repo and 
clients. Also note that the
+* setting value in $wgWBClientSettings overrides the one here.
+*/
'sharedCacheDuration' => 60 * 60,
 
// The type of object cache to use. Use CACHE_XXX constants.
diff --git a/client/config/WikibaseClient.example.php 
b/client/config/WikibaseClient.example.php
index 2d072e8..92e5d33 100644
--- a/client/config/WikibaseClient.example.php
+++ 

[MediaWiki-commits] [Gerrit] Re-enable MediaWiki code sniffer rule for empty comments - change (mediawiki...Wikibase)

2015-10-30 Thread WMDE
Thiemo Mättig (WMDE) has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/250027

Change subject: Re-enable MediaWiki code sniffer rule for empty comments
..

Re-enable MediaWiki code sniffer rule for empty comments

Change-Id: Ib7107c49c081a8a7d67f08892b84cf17e9a08cbd
---
M client/config/WikibaseClient.default.php
M client/config/WikibaseClient.example.php
M client/includes/store/sql/BulkSubscriptionUpdater.php
M phpcs.xml
M repo/config/Wikibase.default.php
M repo/includes/OutputPageJsConfigBuilder.php
M repo/includes/store/sql/WikiPageEntityStore.php
7 files changed, 107 insertions(+), 87 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/27/250027/1

diff --git a/client/config/WikibaseClient.default.php 
b/client/config/WikibaseClient.default.php
index bc2069e..0e3cf71 100644
--- a/client/config/WikibaseClient.default.php
+++ b/client/config/WikibaseClient.default.php
@@ -56,29 +56,37 @@
// Enable in case wbc_entity_usage does not exist or is not yet 
populated.
'useLegacyUsageIndex' => false,
 
-   // Enable in case wb_changes_subscription does not exist (on 
the repo) or is not yet populated.
-   //
-   // @note: if Wikibase Repo and Client are enabled on the same 
wiki, then this only needs
-   // to be set in the repo or can be set the same in both. (repo 
settings override client settings)
+   /**
+* Enable in case wb_changes_subscription does not exist (on 
the repo) or is not yet
+* populated.
+*
+* @note If Wikibase Repo and Client are enabled on the same 
wiki, then this only needs to
+* be set in the repo or can be set the same in both (repo 
settings override client
+* settings).
+*/
'useLegacyChangesSubscription' => false,
 
-   // Prefix to use for cache keys that should be shared among a 
Wikibase Repo instance
-   // and all its clients. This is for things like caching entity 
blobs in memcached.
-   //
-   // The default here assumes Wikibase Repo + Client installed 
together on the same wiki.
-   // For a multiwiki / wikifarm setup, to configure shared caches 
between clients and repo,
-   // this needs to be set to the same value in both client and 
repo wiki settings.
-   //
-   // For Wikidata production, we set it to 
'wikibase-shared/wikidata_1_25wmf24-wikidatawiki',
-   // which is 'wikibase_shared/' + deployment branch name + '-' + 
repo database name,
-   // and have it set in both $wgWBClientSettings and 
$wgWBRepoSettings.
+   /**
+* Prefix to use for cache keys that should be shared among a 
Wikibase Repo instance and all
+* its clients. This is for things like caching entity blobs in 
memcached.
+*
+* The default here assumes Wikibase Repo + Client installed 
together on the same wiki. For
+* a multiwiki / wikifarm setup, to configure shared caches 
between clients and repo, this
+* needs to be set to the same value in both client and repo 
wiki settings.
+*
+* For Wikidata production, we set it to 
'wikibase-shared/wikidata_1_25wmf24-wikidatawiki',
+* which is 'wikibase_shared/' + deployment branch name + '-' + 
repo database name, and have
+* it set in both $wgWBClientSettings and $wgWBRepoSettings.
+*/
'sharedCacheKeyPrefix' => 'wikibase_shared/' . WBL_VERSION . 
'-' . $GLOBALS['wgDBname'],
 
-   // The duration of the object cache, in seconds.
-   //
-   // As with sharedCacheKeyPrefix, this is both client and repo 
setting. On a multiwiki
-   // setup, this should be set to the same value in both the repo 
and clients.
-   // Also note that the setting value in $wgWBClientSettings 
overrides the one here.
+   /**
+* The duration of the object cache, in seconds.
+*
+* As with sharedCacheKeyPrefix, this is both client and repo 
setting. On a multiwiki setup,
+* this should be set to the same value in both the repo and 
clients. Also note that the
+* setting value in $wgWBClientSettings overrides the one here.
+*/
'sharedCacheDuration' => 60 * 60,
 
// The type of object cache to use. Use CACHE_XXX constants.
diff --git a/client/config/WikibaseClient.example.php 
b/client/config/WikibaseClient.example.php
index 2d072e8..92e5d33 100644
--- a/client/config/WikibaseClient.example.php
+++