[MediaWiki-commits] [Gerrit] Remove repeated var name from @var doc tags - change (mediawiki...Wikibase)

2014-12-03 Thread WMDE 
Thiemo Mättig (WMDE) has uploaded a new change for review.

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

Change subject: Remove repeated var name from @var doc tags
..

Remove repeated var name from @var doc tags

This is a copy  paste error. The var name must be repeated if the
@var doc tag is used inline, but not for class properties.

This also fixes some closely related mistakes in doc tags.

Change-Id: I72b8ac68f2b68a2ed2a2bf5fdfd72ab1ae2506c4
---
M client/includes/Changes/ChangeHandler.php
M client/includes/store/UsageUpdater.php
M client/includes/store/sql/DirectSqlStore.php
M client/tests/phpunit/includes/Changes/ChangeHandlerTest.php
M client/tests/phpunit/includes/LangLinkHandlerTest.php
M lib/includes/ChangeNotificationJob.php
M lib/includes/changes/EntityChange.php
M lib/includes/serializers/SiteLinkSerializer.php
M lib/includes/store/CachingEntityRevisionLookup.php
M repo/includes/api/ModifyEntity.php
M repo/includes/store/sql/EntityPerPageBuilder.php
M repo/includes/store/sql/ItemsPerSiteBuilder.php
M repo/includes/store/sql/PropertyInfoTableBuilder.php
M repo/includes/store/sql/TermSearchKeyBuilder.php
14 files changed, 56 insertions(+), 44 deletions(-)


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

diff --git a/client/includes/Changes/ChangeHandler.php 
b/client/includes/Changes/ChangeHandler.php
index 037dfcd..8d4f72c 100644
--- a/client/includes/Changes/ChangeHandler.php
+++ b/client/includes/Changes/ChangeHandler.php
@@ -51,7 +51,7 @@
const HISTORY_ENTRY_ACTION = 16;
 
/**
-* @var PageUpdater $updater
+* @var PageUpdater
 */
private $updater;
 
@@ -263,7 +263,7 @@
 *
 * @param EntityChange $change The Change that caused the update
 *
-* @return array|boolean an array of RC attributes,
+* @return array[]|bool an array of RC attributes,
 * or false if the change does not provide edit meta data
 */
private function getRCAttributes( EntityChange $change ) {
diff --git a/client/includes/store/UsageUpdater.php 
b/client/includes/store/UsageUpdater.php
index 77ee7a6..81f8c35 100644
--- a/client/includes/store/UsageUpdater.php
+++ b/client/includes/store/UsageUpdater.php
@@ -18,7 +18,7 @@
 class UsageUpdater {
 
/**
-* @var string $clientId
+* @var string
 */
private $clientId;
 
diff --git a/client/includes/store/sql/DirectSqlStore.php 
b/client/includes/store/sql/DirectSqlStore.php
index 251bcc6..88ea5fa 100644
--- a/client/includes/store/sql/DirectSqlStore.php
+++ b/client/includes/store/sql/DirectSqlStore.php
@@ -71,7 +71,7 @@
private $entityIdParser;
 
/**
-* @var String|bool $repoWiki
+* @var string|bool
 */
protected $repoWiki;
 
@@ -124,7 +124,7 @@
 * @param EntityContentDataCodec $contentCodec
 * @param Language $wikiLanguage
 * @param EntityIdParser $entityIdParser
-* @param string $repoWiki the symbolic database name of the repo wiki
+* @param string|bool $repoWiki the symbolic database name of the repo 
wiki
 */
public function __construct(
EntityContentDataCodec $contentCodec,
diff --git a/client/tests/phpunit/includes/Changes/ChangeHandlerTest.php 
b/client/tests/phpunit/includes/Changes/ChangeHandlerTest.php
index 57b5d06..a8608bd 100644
--- a/client/tests/phpunit/includes/Changes/ChangeHandlerTest.php
+++ b/client/tests/phpunit/includes/Changes/ChangeHandlerTest.php
@@ -39,7 +39,9 @@
  */
 class ChangeHandlerTest extends \MediaWikiTestCase {
 
-   /** @var Site $site */
+   /**
+* @var Site
+*/
protected $site;
 
protected function setUp() {
diff --git a/client/tests/phpunit/includes/LangLinkHandlerTest.php 
b/client/tests/phpunit/includes/LangLinkHandlerTest.php
index e98fb3e..837fba6 100644
--- a/client/tests/phpunit/includes/LangLinkHandlerTest.php
+++ b/client/tests/phpunit/includes/LangLinkHandlerTest.php
@@ -31,12 +31,12 @@
 class LangLinkHandlerTest extends \MediaWikiTestCase {
 
/**
-* @var MockRepository $mockRepo
+* @var MockRepository
 */
private $mockRepo;
 
/**
-* @var LangLinkHandler $langLinkHandler
+* @var LangLinkHandler
 */
private $langLinkHandler;
 
diff --git a/lib/includes/ChangeNotificationJob.php 
b/lib/includes/ChangeNotificationJob.php
index fdc8be4..1b5ee5a 100644
--- a/lib/includes/ChangeNotificationJob.php
+++ b/lib/includes/ChangeNotificationJob.php
@@ -16,7 +16,7 @@
 class ChangeNotificationJob extends \Job {
 
/**
-* @var Change[] $changes: initialized lazily by getChanges().
+* @var Change[]|null
 */
private $changes = null;
 
@@ -123,9 +123,7 @@
}
 
/**
-* Run the job
-

[MediaWiki-commits] [Gerrit] Remove repeated var name from @var doc tags - change (mediawiki...Wikibase)

2014-12-03 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Remove repeated var name from @var doc tags
..


Remove repeated var name from @var doc tags

This is a copy  paste error. The var name must be repeated if the
@var doc tag is used inline, but not for class properties.

This also fixes some closely related mistakes in doc tags.

Change-Id: I72b8ac68f2b68a2ed2a2bf5fdfd72ab1ae2506c4
---
M client/includes/Changes/ChangeHandler.php
M client/includes/store/UsageUpdater.php
M client/includes/store/sql/DirectSqlStore.php
M client/tests/phpunit/includes/Changes/ChangeHandlerTest.php
M client/tests/phpunit/includes/LangLinkHandlerTest.php
M lib/includes/ChangeNotificationJob.php
M lib/includes/changes/EntityChange.php
M lib/includes/serializers/SiteLinkSerializer.php
M lib/includes/store/CachingEntityRevisionLookup.php
M repo/includes/api/ModifyEntity.php
M repo/includes/store/sql/EntityPerPageBuilder.php
M repo/includes/store/sql/ItemsPerSiteBuilder.php
M repo/includes/store/sql/PropertyInfoTableBuilder.php
M repo/includes/store/sql/TermSearchKeyBuilder.php
14 files changed, 67 insertions(+), 53 deletions(-)

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



diff --git a/client/includes/Changes/ChangeHandler.php 
b/client/includes/Changes/ChangeHandler.php
index 57e3082..f2a205f 100644
--- a/client/includes/Changes/ChangeHandler.php
+++ b/client/includes/Changes/ChangeHandler.php
@@ -63,7 +63,7 @@
private $titleFactory;
 
/**
-* @var PageUpdater $updater
+* @var PageUpdater
 */
private $updater;
 
@@ -293,7 +293,7 @@
 *
 * @param EntityChange $change The Change that caused the update
 *
-* @return array|boolean an array of RC attributes,
+* @return array[]|bool an array of RC attributes,
 * or false if the change does not provide edit meta data
 */
private function getRCAttributes( EntityChange $change ) {
diff --git a/client/includes/store/UsageUpdater.php 
b/client/includes/store/UsageUpdater.php
index 77ee7a6..81f8c35 100644
--- a/client/includes/store/UsageUpdater.php
+++ b/client/includes/store/UsageUpdater.php
@@ -18,7 +18,7 @@
 class UsageUpdater {
 
/**
-* @var string $clientId
+* @var string
 */
private $clientId;
 
diff --git a/client/includes/store/sql/DirectSqlStore.php 
b/client/includes/store/sql/DirectSqlStore.php
index 251bcc6..88ea5fa 100644
--- a/client/includes/store/sql/DirectSqlStore.php
+++ b/client/includes/store/sql/DirectSqlStore.php
@@ -71,7 +71,7 @@
private $entityIdParser;
 
/**
-* @var String|bool $repoWiki
+* @var string|bool
 */
protected $repoWiki;
 
@@ -124,7 +124,7 @@
 * @param EntityContentDataCodec $contentCodec
 * @param Language $wikiLanguage
 * @param EntityIdParser $entityIdParser
-* @param string $repoWiki the symbolic database name of the repo wiki
+* @param string|bool $repoWiki the symbolic database name of the repo 
wiki
 */
public function __construct(
EntityContentDataCodec $contentCodec,
diff --git a/client/tests/phpunit/includes/Changes/ChangeHandlerTest.php 
b/client/tests/phpunit/includes/Changes/ChangeHandlerTest.php
index e300e7f..cdc34a0 100644
--- a/client/tests/phpunit/includes/Changes/ChangeHandlerTest.php
+++ b/client/tests/phpunit/includes/Changes/ChangeHandlerTest.php
@@ -41,7 +41,9 @@
  */
 class ChangeHandlerTest extends \MediaWikiTestCase {
 
-   /** @var Site $site */
+   /**
+* @var Site
+*/
protected $site;
 
protected function setUp() {
diff --git a/client/tests/phpunit/includes/LangLinkHandlerTest.php 
b/client/tests/phpunit/includes/LangLinkHandlerTest.php
index e98fb3e..837fba6 100644
--- a/client/tests/phpunit/includes/LangLinkHandlerTest.php
+++ b/client/tests/phpunit/includes/LangLinkHandlerTest.php
@@ -31,12 +31,12 @@
 class LangLinkHandlerTest extends \MediaWikiTestCase {
 
/**
-* @var MockRepository $mockRepo
+* @var MockRepository
 */
private $mockRepo;
 
/**
-* @var LangLinkHandler $langLinkHandler
+* @var LangLinkHandler
 */
private $langLinkHandler;
 
diff --git a/lib/includes/ChangeNotificationJob.php 
b/lib/includes/ChangeNotificationJob.php
index fdc8be4..73deb72 100644
--- a/lib/includes/ChangeNotificationJob.php
+++ b/lib/includes/ChangeNotificationJob.php
@@ -2,6 +2,8 @@
 
 namespace Wikibase;
 
+use Job;
+use Title;
 use Wikibase\Client\Changes\ChangeHandler;
 use Wikibase\Client\WikibaseClient;
 
@@ -13,10 +15,10 @@
  * @licence GNU GPL v2+
  * @author Daniel Kinzler
  */
-class ChangeNotificationJob extends \Job {
+class ChangeNotificationJob extends Job {
 
/**
-* @var Change[] $changes: