[MediaWiki-commits] [Gerrit] Revert Update Wikidata - add usage tracking job - change (mediawiki...Wikidata)

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

Change subject: Revert Update Wikidata - add usage tracking job
..


Revert Update Wikidata - add usage tracking job

investigating if something is wrong here.

This reverts commit 7bc731811b848570133e2cf97f775d293ab8cac1.

Change-Id: I4f32726c5747d7bd68d7bcf9934e006695697441
---
M composer.lock
M extensions/Wikibase/.jscsrc
M extensions/Wikibase/client/WikibaseClient.php
M extensions/Wikibase/client/includes/Hooks/DataUpdateHookHandlers.php
M extensions/Wikibase/client/includes/Usage/EntityUsage.php
D extensions/Wikibase/client/includes/store/AddUsagesForPageJob.php
M extensions/Wikibase/client/includes/store/ClientStore.php
M extensions/Wikibase/client/includes/store/sql/DirectSqlStore.php
M extensions/Wikibase/client/tests/phpunit/MockClientStore.php
M 
extensions/Wikibase/client/tests/phpunit/includes/Hooks/DataUpdateHookHandlersTest.php
M extensions/Wikibase/client/tests/phpunit/includes/Usage/EntityUsageTest.php
D 
extensions/Wikibase/client/tests/phpunit/includes/store/AddUsagesForPageJobTest.php
M extensions/Wikibase/composer.json
M extensions/Wikibase/package.json
M vendor/composer/autoload_classmap.php
M vendor/composer/installed.json
16 files changed, 47 insertions(+), 523 deletions(-)

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



diff --git a/composer.lock b/composer.lock
index 07826bc..717f103 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1326,12 +1326,12 @@
 source: {
 type: git,
 url: 
https://github.com/wikimedia/mediawiki-extensions-Wikibase.git;,
-reference: 7ed9b2a65f6ff6be7293d796b01e597dd9164c81
+reference: 2498f76188fe714f19fdd68ca89a6ac34ecd4e4c
 },
 dist: {
 type: zip,
-url: 
https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/7ed9b2a65f6ff6be7293d796b01e597dd9164c81;,
-reference: 7ed9b2a65f6ff6be7293d796b01e597dd9164c81,
+url: 
https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/2498f76188fe714f19fdd68ca89a6ac34ecd4e4c;,
+reference: 2498f76188fe714f19fdd68ca89a6ac34ecd4e4c,
 shasum: 
 },
 require: {
@@ -1350,8 +1350,8 @@
 php: =5.3.2,
 wikibase/data-model: ~3.0,
 wikibase/data-model-javascript: ^1.0.2,
-wikibase/data-model-serialization: ~1.4.0,
-wikibase/internal-serialization: ~1.4.0,
+wikibase/data-model-serialization: ~1.4,
+wikibase/internal-serialization: ~1.4,
 wikibase/javascript-api: ~1.0,
 wikibase/serialization-javascript: ~2.0
 },
@@ -1399,7 +1399,7 @@
 wikibaserepo,
 wikidata
 ],
-time: 2015-07-29 02:42:33
+time: 2015-07-23 01:52:42
 },
 {
 name: wikibase/wikimedia-badges,
diff --git a/extensions/Wikibase/.jscsrc b/extensions/Wikibase/.jscsrc
index 312c030..f66f6bd 100644
--- a/extensions/Wikibase/.jscsrc
+++ b/extensions/Wikibase/.jscsrc
@@ -3,26 +3,12 @@
preset: wikimedia,
 
// 
-   // Rules from wikimedia preset we don't yet? follow
+   // Rules from wikimedia preset we don't follow
 
validateIndentation: null,
requireMultipleVarDecl: null,
disallowDanglingUnderscores: null,
-   requireSpacesInsideBrackets: null,
-   requireVarDeclFirst: null,
-   jsDoc: {
-   // what we don't yet follow is commented out
-   //checkAnnotations: jsduck5,
-   //checkParamNames: true,
-   requireParamTypes: true,
-   checkRedundantParams: true,
-   //checkReturnTypes: true,
-   checkRedundantReturns: true,
-   //requireReturnTypes: true,
-   //checkTypes: capitalizedNativeCase,
-   checkRedundantAccess: true
-   //requireNewlineAfterDescription: true
-   },
+   requireSpacesInsideArrayBrackets: null,
 
// 
// Own rules
@@ -38,5 +24,5 @@
else
],
 
-   excludeFiles: [ node_modules/**, vendor/**, extensions/** ]
+   excludeFiles: [ node_modules/**, vendor/** ]
 }
diff --git a/extensions/Wikibase/client/WikibaseClient.php 
b/extensions/Wikibase/client/WikibaseClient.php
index deefc1f..4c48108 100644
--- a/extensions/Wikibase/client/WikibaseClient.php
+++ b/extensions/Wikibase/client/WikibaseClient.php
@@ -67,7 +67,6 @@
global $wgExtensionCredits, $wgExtensionMessagesFiles, $wgHooks;
global $wgAPIMetaModules, $wgAPIPropModules, $wgSpecialPages, 
$wgResourceModules;
global $wgWBClientSettings, $wgRecentChangesFlags, $wgMessagesDirs;
-   global

[MediaWiki-commits] [Gerrit] Revert Update Wikidata - add usage tracking job - change (mediawiki...Wikidata)

2015-07-29 Thread Aude (Code Review) 
Aude has uploaded a new change for review.

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

Change subject: Revert Update Wikidata - add usage tracking job
..

Revert Update Wikidata - add usage tracking job

investigating if something is wrong here.

This reverts commit 7bc731811b848570133e2cf97f775d293ab8cac1.

Change-Id: I4f32726c5747d7bd68d7bcf9934e006695697441
---
M composer.lock
M extensions/Wikibase/.jscsrc
M extensions/Wikibase/client/WikibaseClient.php
M extensions/Wikibase/client/includes/Hooks/DataUpdateHookHandlers.php
M extensions/Wikibase/client/includes/Usage/EntityUsage.php
D extensions/Wikibase/client/includes/store/AddUsagesForPageJob.php
M extensions/Wikibase/client/includes/store/ClientStore.php
M extensions/Wikibase/client/includes/store/sql/DirectSqlStore.php
M extensions/Wikibase/client/tests/phpunit/MockClientStore.php
M 
extensions/Wikibase/client/tests/phpunit/includes/Hooks/DataUpdateHookHandlersTest.php
M extensions/Wikibase/client/tests/phpunit/includes/Usage/EntityUsageTest.php
D 
extensions/Wikibase/client/tests/phpunit/includes/store/AddUsagesForPageJobTest.php
M extensions/Wikibase/composer.json
M extensions/Wikibase/package.json
M vendor/composer/autoload_classmap.php
M vendor/composer/installed.json
16 files changed, 47 insertions(+), 523 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata 
refs/changes/16/227716/1

diff --git a/composer.lock b/composer.lock
index 07826bc..717f103 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1326,12 +1326,12 @@
 source: {
 type: git,
 url: 
https://github.com/wikimedia/mediawiki-extensions-Wikibase.git;,
-reference: 7ed9b2a65f6ff6be7293d796b01e597dd9164c81
+reference: 2498f76188fe714f19fdd68ca89a6ac34ecd4e4c
 },
 dist: {
 type: zip,
-url: 
https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/7ed9b2a65f6ff6be7293d796b01e597dd9164c81;,
-reference: 7ed9b2a65f6ff6be7293d796b01e597dd9164c81,
+url: 
https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/2498f76188fe714f19fdd68ca89a6ac34ecd4e4c;,
+reference: 2498f76188fe714f19fdd68ca89a6ac34ecd4e4c,
 shasum: 
 },
 require: {
@@ -1350,8 +1350,8 @@
 php: =5.3.2,
 wikibase/data-model: ~3.0,
 wikibase/data-model-javascript: ^1.0.2,
-wikibase/data-model-serialization: ~1.4.0,
-wikibase/internal-serialization: ~1.4.0,
+wikibase/data-model-serialization: ~1.4,
+wikibase/internal-serialization: ~1.4,
 wikibase/javascript-api: ~1.0,
 wikibase/serialization-javascript: ~2.0
 },
@@ -1399,7 +1399,7 @@
 wikibaserepo,
 wikidata
 ],
-time: 2015-07-29 02:42:33
+time: 2015-07-23 01:52:42
 },
 {
 name: wikibase/wikimedia-badges,
diff --git a/extensions/Wikibase/.jscsrc b/extensions/Wikibase/.jscsrc
index 312c030..f66f6bd 100644
--- a/extensions/Wikibase/.jscsrc
+++ b/extensions/Wikibase/.jscsrc
@@ -3,26 +3,12 @@
preset: wikimedia,
 
// 
-   // Rules from wikimedia preset we don't yet? follow
+   // Rules from wikimedia preset we don't follow
 
validateIndentation: null,
requireMultipleVarDecl: null,
disallowDanglingUnderscores: null,
-   requireSpacesInsideBrackets: null,
-   requireVarDeclFirst: null,
-   jsDoc: {
-   // what we don't yet follow is commented out
-   //checkAnnotations: jsduck5,
-   //checkParamNames: true,
-   requireParamTypes: true,
-   checkRedundantParams: true,
-   //checkReturnTypes: true,
-   checkRedundantReturns: true,
-   //requireReturnTypes: true,
-   //checkTypes: capitalizedNativeCase,
-   checkRedundantAccess: true
-   //requireNewlineAfterDescription: true
-   },
+   requireSpacesInsideArrayBrackets: null,
 
// 
// Own rules
@@ -38,5 +24,5 @@
else
],
 
-   excludeFiles: [ node_modules/**, vendor/**, extensions/** ]
+   excludeFiles: [ node_modules/**, vendor/** ]
 }
diff --git a/extensions/Wikibase/client/WikibaseClient.php 
b/extensions/Wikibase/client/WikibaseClient.php
index deefc1f..4c48108 100644
--- a/extensions/Wikibase/client/WikibaseClient.php
+++ b/extensions/Wikibase/client/WikibaseClient.php
@@ -67,7 +67,6 @@
global $wgExtensionCredits, $wgExtensionMessagesFiles, $wgHooks;
global $wgAPIMetaModules, $wgAPIPropModules, $wgSpecialPages, 
$wgResourceModules;
global $wgWBClientSettings,