[MediaWiki-commits] [Gerrit] mediawiki...WikibaseLexeme[master]: Lemmata to Lemmas

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

Change subject: Lemmata to Lemmas
..


Lemmata to Lemmas

Change-Id: Ifd5a552ebda233d6bfcd096595b25cfd8149
---
M src/Content/LexemeContent.php
M src/DataModel/Lexeme.php
R src/DataModel/Providers/LemmasProvider.php
M src/DataModel/Serialization/LexemeDeserializer.php
M src/DataModel/Serialization/LexemeSerializer.php
M src/DataModel/Services/Diff/LexemeDiff.php
M src/DataModel/Services/Diff/LexemeDiffer.php
M src/DataModel/Services/Diff/LexemePatcher.php
M src/Specials/SpecialNewLexeme.php
M src/View/LexemeView.php
M tests/phpunit/composer/DataModel/LexemeTest.php
M tests/phpunit/composer/DataModel/Serialization/LexemeDeserializerTest.php
12 files changed, 74 insertions(+), 74 deletions(-)

Approvals:
  WMDE-leszek: Looks good to me, approved
  Ladsgroup: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/src/Content/LexemeContent.php b/src/Content/LexemeContent.php
index 43bf8e4..c3eaa79 100644
--- a/src/Content/LexemeContent.php
+++ b/src/Content/LexemeContent.php
@@ -74,8 +74,8 @@
public function isStub() {
return !$this->isRedirect()
&& !$this->getEntity()->isEmpty()
-   && ( is_null( $this->getEntity()->getLemmata() )
-   || !$this->getEntity()->getLemmata()->isEmpty() 
)
+   && ( is_null( $this->getEntity()->getLemmas() )
+   || !$this->getEntity()->getLemmas()->isEmpty() )
&& $this->getEntity()->getStatements()->isEmpty();
}
 
diff --git a/src/DataModel/Lexeme.php b/src/DataModel/Lexeme.php
index f4f4a32..773dd85 100644
--- a/src/DataModel/Lexeme.php
+++ b/src/DataModel/Lexeme.php
@@ -12,13 +12,13 @@
 use Wikibase\DataModel\Term\FingerprintProvider;
 use Wikibase\DataModel\Term\LabelsProvider;
 use Wikibase\DataModel\Term\TermList;
-use Wikibase\Lexeme\DataModel\Providers\LemmataProvider;
+use Wikibase\Lexeme\DataModel\Providers\LemmasProvider;
 
 /**
  * @license GPL-2.0+
  */
 class Lexeme implements EntityDocument, StatementListProvider, 
FingerprintProvider,
-   LabelsProvider, DescriptionsProvider, LemmataProvider {
+   LabelsProvider, DescriptionsProvider, LemmasProvider {
 
const ENTITY_TYPE = 'lexeme';
 
@@ -40,21 +40,21 @@
/**
 * @var TermList|null
 */
-   private $lemmata;
+   private $lemmas;
 
/**
 * @param LexemeId|null $id
-* @param TermList|null $lemmata
+* @param TermList|null $lemmas
 * @param StatementList|null $statements
 */
public function __construct(
LexemeId $id = null,
-   TermList $lemmata = null,
+   TermList $lemmas = null,
StatementList $statements = null
) {
// TODO: add lemma, language and lexical category
$this->id = $id;
-   $this->lemmata = $lemmata;
+   $this->lemmas = $lemmas;
$this->statements = $statements ?: new StatementList();
// TODO: Remove this once Wikibase can work without fingerprint
$this->fingerprint = new Fingerprint();
@@ -135,8 +135,8 @@
 */
public function isEmpty() {
// TODO: should also check other attributes once implemented
-   return ( is_null( $this->lemmata )
-   || $this->lemmata->isEmpty() )
+   return ( is_null( $this->lemmas )
+   || $this->lemmas->isEmpty() )
&& $this->statements->isEmpty();
}
 
@@ -157,11 +157,11 @@
return false;
}
 
-   $sameLemmata = ( $this->lemmata === $target->getLemmata() || (
-   $this->lemmata !== null
-   && $this->lemmata->equals( $target->getLemmata() ) )
+   $sameLemmas = ( $this->lemmas === $target->getLemmas() || (
+   $this->lemmas !== null
+   && $this->lemmas->equals( $target->getLemmas() ) )
);
-   return $sameLemmata
+   return $sameLemmas
&& $this->statements->equals( $target->statements );
}
 
@@ -185,15 +185,15 @@
/**
 * @return TermList
 */
-   public function getLemmata() {
-   return $this->lemmata;
+   public function getLemmas() {
+   return $this->lemmas;
}
 
/**
-* @param TermList $lemmata
+* @param TermList $lemmas
 */
-   public function setLemmata( TermList $lemmata ) {
-   $this->lemmata = $lemmata;
+   public function setLemmas( TermList $lemmas ) {
+   $this->lemmas = $lemmas;
}
 
 }
diff --git a/src/DataModel/Prov

[MediaWiki-commits] [Gerrit] mediawiki...WikibaseLexeme[master]: Lemmata to Lemmas

2016-12-01 Thread Ladsgroup (Code Review) 
Ladsgroup has uploaded a new change for review.

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

Change subject: Lemmata to Lemmas
..

Lemmata to Lemmas

Change-Id: Ifd5a552ebda233d6bfcd096595b25cfd8149
---
M src/Content/LexemeContent.php
M src/DataModel/Lexeme.php
M src/DataModel/Providers/LemmataProvider.php
M src/DataModel/Serialization/LexemeDeserializer.php
M src/DataModel/Serialization/LexemeSerializer.php
M src/DataModel/Services/Diff/LexemeDiff.php
M src/DataModel/Services/Diff/LexemeDiffer.php
M src/DataModel/Services/Diff/LexemePatcher.php
M src/Specials/SpecialNewLexeme.php
M src/View/LexemeView.php
M tests/phpunit/composer/DataModel/LexemeTest.php
M tests/phpunit/composer/DataModel/Serialization/LexemeDeserializerTest.php
12 files changed, 74 insertions(+), 74 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseLexeme 
refs/changes/28/324728/1

diff --git a/src/Content/LexemeContent.php b/src/Content/LexemeContent.php
index 43bf8e4..c3eaa79 100644
--- a/src/Content/LexemeContent.php
+++ b/src/Content/LexemeContent.php
@@ -74,8 +74,8 @@
public function isStub() {
return !$this->isRedirect()
&& !$this->getEntity()->isEmpty()
-   && ( is_null( $this->getEntity()->getLemmata() )
-   || !$this->getEntity()->getLemmata()->isEmpty() 
)
+   && ( is_null( $this->getEntity()->getLemmas() )
+   || !$this->getEntity()->getLemmas()->isEmpty() )
&& $this->getEntity()->getStatements()->isEmpty();
}
 
diff --git a/src/DataModel/Lexeme.php b/src/DataModel/Lexeme.php
index f4f4a32..773dd85 100644
--- a/src/DataModel/Lexeme.php
+++ b/src/DataModel/Lexeme.php
@@ -12,13 +12,13 @@
 use Wikibase\DataModel\Term\FingerprintProvider;
 use Wikibase\DataModel\Term\LabelsProvider;
 use Wikibase\DataModel\Term\TermList;
-use Wikibase\Lexeme\DataModel\Providers\LemmataProvider;
+use Wikibase\Lexeme\DataModel\Providers\LemmasProvider;
 
 /**
  * @license GPL-2.0+
  */
 class Lexeme implements EntityDocument, StatementListProvider, 
FingerprintProvider,
-   LabelsProvider, DescriptionsProvider, LemmataProvider {
+   LabelsProvider, DescriptionsProvider, LemmasProvider {
 
const ENTITY_TYPE = 'lexeme';
 
@@ -40,21 +40,21 @@
/**
 * @var TermList|null
 */
-   private $lemmata;
+   private $lemmas;
 
/**
 * @param LexemeId|null $id
-* @param TermList|null $lemmata
+* @param TermList|null $lemmas
 * @param StatementList|null $statements
 */
public function __construct(
LexemeId $id = null,
-   TermList $lemmata = null,
+   TermList $lemmas = null,
StatementList $statements = null
) {
// TODO: add lemma, language and lexical category
$this->id = $id;
-   $this->lemmata = $lemmata;
+   $this->lemmas = $lemmas;
$this->statements = $statements ?: new StatementList();
// TODO: Remove this once Wikibase can work without fingerprint
$this->fingerprint = new Fingerprint();
@@ -135,8 +135,8 @@
 */
public function isEmpty() {
// TODO: should also check other attributes once implemented
-   return ( is_null( $this->lemmata )
-   || $this->lemmata->isEmpty() )
+   return ( is_null( $this->lemmas )
+   || $this->lemmas->isEmpty() )
&& $this->statements->isEmpty();
}
 
@@ -157,11 +157,11 @@
return false;
}
 
-   $sameLemmata = ( $this->lemmata === $target->getLemmata() || (
-   $this->lemmata !== null
-   && $this->lemmata->equals( $target->getLemmata() ) )
+   $sameLemmas = ( $this->lemmas === $target->getLemmas() || (
+   $this->lemmas !== null
+   && $this->lemmas->equals( $target->getLemmas() ) )
);
-   return $sameLemmata
+   return $sameLemmas
&& $this->statements->equals( $target->statements );
}
 
@@ -185,15 +185,15 @@
/**
 * @return TermList
 */
-   public function getLemmata() {
-   return $this->lemmata;
+   public function getLemmas() {
+   return $this->lemmas;
}
 
/**
-* @param TermList $lemmata
+* @param TermList $lemmas
 */
-   public function setLemmata( TermList $lemmata ) {
-   $this->lemmata = $lemmata;
+   public function setLemmas( TermList $lemmas ) {
+   $this->lemmas = $lemmas;
}
 
 }
diff --git