[MediaWiki-commits] [Gerrit] Consistent SiteLink naming and dead code removed - change (mediawiki...Wikibase)

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

Change subject: Consistent SiteLink naming and dead code removed
..


Consistent SiteLink naming and dead code removed

I started this patch with uppercasing some L in $siteLink
variable names and cleaned some more code I came accross while
doing this.

Change-Id: I176df356f2f6a48a79d35327c3786597ed9923fd
---
M lib/includes/serializers/AliasSerializer.php
M lib/includes/serializers/ByPropertyListSerializer.php
M lib/includes/serializers/ByPropertyListUnserializer.php
M lib/includes/serializers/ClaimsSerializer.php
M lib/includes/serializers/DescriptionSerializer.php
M lib/includes/serializers/EntitySerializer.php
M lib/includes/serializers/ItemSerializer.php
M lib/includes/serializers/LabelSerializer.php
M lib/includes/serializers/ListSerializer.php
M lib/includes/serializers/ListUnserializer.php
M lib/includes/serializers/MultilingualSerializer.php
M lib/includes/serializers/ReferenceSerializer.php
M lib/includes/serializers/SerializerObject.php
M lib/includes/serializers/SiteLinkSerializer.php
M lib/includes/serializers/SnakSerializer.php
M lib/tests/phpunit/serializers/SiteLinkSerializerTest.php
M lib/tests/phpunit/store/SiteLinkTableTest.php
M lib/tests/phpunit/store/SqlEntityInfoBuilderTest.php
M repo/includes/api/EditEntity.php
M repo/includes/api/ResultBuilder.php
M repo/includes/specials/SpecialDispatchStats.php
M repo/includes/specials/SpecialItemResolver.php
M repo/tests/phpunit/includes/api/GetEntitiesTest.php
M repo/tests/phpunit/includes/api/ResultBuilderTest.php
M repo/tests/phpunit/includes/api/SetSiteLinkTest.php
25 files changed, 111 insertions(+), 146 deletions(-)

Approvals:
  Jeroen De Dauw: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/lib/includes/serializers/AliasSerializer.php 
b/lib/includes/serializers/AliasSerializer.php
index 9cf8b4f..8fef354 100644
--- a/lib/includes/serializers/AliasSerializer.php
+++ b/lib/includes/serializers/AliasSerializer.php
@@ -18,17 +18,6 @@
 class AliasSerializer extends SerializerObject implements Unserializer {
 
/**
-* Constructor.
-*
-* @since 0.4
-*
-* @param SerializationOptions $options
-*/
-   public function __construct( SerializationOptions $options = null ) {
-   parent::__construct( $options );
-   }
-
-   /**
 * Returns a serialized array of aliases.
 *
 * @since 0.4
@@ -136,4 +125,5 @@
 
return $aliases;
}
+
 }
diff --git a/lib/includes/serializers/ByPropertyListSerializer.php 
b/lib/includes/serializers/ByPropertyListSerializer.php
index 86bce1a..8c4e5e6 100644
--- a/lib/includes/serializers/ByPropertyListSerializer.php
+++ b/lib/includes/serializers/ByPropertyListSerializer.php
@@ -20,29 +20,27 @@
const OPT_ADD_LOWER_CASE_KEYS = 'addLowerCaseKeys';
 
/**
-* @since 0.2
-*
 * @var string
 */
-   protected $elementName;
+   private $elementName;
 
/**
-* @since 0.2
-*
 * @var Serializer
 */
-   protected $elementSerializer;
+   private $elementSerializer;
 
/**
-* Constructor.
-*
 * @since 0.2
 *
 * @param string $elementName
 * @param Serializer $elementSerializer
 * @param SerializationOptions|null $options
 */
-   public function __construct( $elementName, Serializer 
$elementSerializer, SerializationOptions $options = null ) {
+   public function __construct(
+   $elementName,
+   Serializer $elementSerializer,
+   SerializationOptions $options = null
+   ) {
parent::__construct( $options );
 
$this-elementName = $elementName;
diff --git a/lib/includes/serializers/ByPropertyListUnserializer.php 
b/lib/includes/serializers/ByPropertyListUnserializer.php
index 820abf3..a645188 100644
--- a/lib/includes/serializers/ByPropertyListUnserializer.php
+++ b/lib/includes/serializers/ByPropertyListUnserializer.php
@@ -22,11 +22,9 @@
 *
 * @var Serializer
 */
-   protected $elementUnserializer;
+   private $elementUnserializer;
 
/**
-* Constructor.
-*
 * @since 0.2
 *
 * @param Unserializer $elementUnserializer
diff --git a/lib/includes/serializers/ClaimsSerializer.php 
b/lib/includes/serializers/ClaimsSerializer.php
index 4f2b08a..d2e04be 100644
--- a/lib/includes/serializers/ClaimsSerializer.php
+++ b/lib/includes/serializers/ClaimsSerializer.php
@@ -39,7 +39,7 @@
 *
 * @since 0.2
 *
-* @param mixed $claims
+* @param Claims $claims
 *
 * @return array
 * @throws InvalidArgumentException
diff --git a/lib/includes/serializers/DescriptionSerializer.php

[MediaWiki-commits] [Gerrit] Consistent SiteLink naming and dead code removed - change (mediawiki...Wikibase)

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

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

Change subject: Consistent SiteLink naming and dead code removed
..

Consistent SiteLink naming and dead code removed

I started this patch with uppercasing some L in $siteLink
variable names and cleaned some more code I came accross while
doing this.

Change-Id: I176df356f2f6a48a79d35327c3786597ed9923fd
---
M lib/includes/serializers/AliasSerializer.php
M lib/includes/serializers/ByPropertyListSerializer.php
M lib/includes/serializers/ByPropertyListUnserializer.php
M lib/includes/serializers/ClaimsSerializer.php
M lib/includes/serializers/DescriptionSerializer.php
M lib/includes/serializers/EntitySerializer.php
M lib/includes/serializers/ItemSerializer.php
M lib/includes/serializers/LabelSerializer.php
M lib/includes/serializers/ListSerializer.php
M lib/includes/serializers/ListUnserializer.php
M lib/includes/serializers/MultilingualSerializer.php
M lib/includes/serializers/ReferenceSerializer.php
M lib/includes/serializers/SerializerObject.php
M lib/includes/serializers/SiteLinkSerializer.php
M lib/includes/serializers/SnakSerializer.php
M lib/tests/phpunit/serializers/SiteLinkSerializerTest.php
M lib/tests/phpunit/store/SiteLinkTableTest.php
M lib/tests/phpunit/store/SqlEntityInfoBuilderTest.php
M repo/includes/api/EditEntity.php
M repo/includes/api/ResultBuilder.php
M repo/includes/specials/SpecialDispatchStats.php
M repo/includes/specials/SpecialItemResolver.php
M repo/tests/phpunit/includes/api/GetEntitiesTest.php
M repo/tests/phpunit/includes/api/ResultBuilderTest.php
M repo/tests/phpunit/includes/api/SetSiteLinkTest.php
25 files changed, 111 insertions(+), 146 deletions(-)


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

diff --git a/lib/includes/serializers/AliasSerializer.php 
b/lib/includes/serializers/AliasSerializer.php
index 9cf8b4f..8fef354 100644
--- a/lib/includes/serializers/AliasSerializer.php
+++ b/lib/includes/serializers/AliasSerializer.php
@@ -18,17 +18,6 @@
 class AliasSerializer extends SerializerObject implements Unserializer {
 
/**
-* Constructor.
-*
-* @since 0.4
-*
-* @param SerializationOptions $options
-*/
-   public function __construct( SerializationOptions $options = null ) {
-   parent::__construct( $options );
-   }
-
-   /**
 * Returns a serialized array of aliases.
 *
 * @since 0.4
@@ -136,4 +125,5 @@
 
return $aliases;
}
+
 }
diff --git a/lib/includes/serializers/ByPropertyListSerializer.php 
b/lib/includes/serializers/ByPropertyListSerializer.php
index 86bce1a..8c4e5e6 100644
--- a/lib/includes/serializers/ByPropertyListSerializer.php
+++ b/lib/includes/serializers/ByPropertyListSerializer.php
@@ -20,29 +20,27 @@
const OPT_ADD_LOWER_CASE_KEYS = 'addLowerCaseKeys';
 
/**
-* @since 0.2
-*
 * @var string
 */
-   protected $elementName;
+   private $elementName;
 
/**
-* @since 0.2
-*
 * @var Serializer
 */
-   protected $elementSerializer;
+   private $elementSerializer;
 
/**
-* Constructor.
-*
 * @since 0.2
 *
 * @param string $elementName
 * @param Serializer $elementSerializer
 * @param SerializationOptions|null $options
 */
-   public function __construct( $elementName, Serializer 
$elementSerializer, SerializationOptions $options = null ) {
+   public function __construct(
+   $elementName,
+   Serializer $elementSerializer,
+   SerializationOptions $options = null
+   ) {
parent::__construct( $options );
 
$this-elementName = $elementName;
diff --git a/lib/includes/serializers/ByPropertyListUnserializer.php 
b/lib/includes/serializers/ByPropertyListUnserializer.php
index 820abf3..a645188 100644
--- a/lib/includes/serializers/ByPropertyListUnserializer.php
+++ b/lib/includes/serializers/ByPropertyListUnserializer.php
@@ -22,11 +22,9 @@
 *
 * @var Serializer
 */
-   protected $elementUnserializer;
+   private $elementUnserializer;
 
/**
-* Constructor.
-*
 * @since 0.2
 *
 * @param Unserializer $elementUnserializer
diff --git a/lib/includes/serializers/ClaimsSerializer.php 
b/lib/includes/serializers/ClaimsSerializer.php
index 4f2b08a..d2e04be 100644
--- a/lib/includes/serializers/ClaimsSerializer.php
+++ b/lib/includes/serializers/ClaimsSerializer.php
@@ -39,7 +39,7 @@
 *
 * @since 0.2
 *
-* @param mixed $claims
+* @param Claims $claims
 *
 * @return array
 * @throws InvalidArgumentException
diff --git