Aleksey Bekh-Ivanov (WMDE) has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/362185 )
Change subject: Rename `LexemeForm` to `Form` and `LexemeFormId` to `FormId`
......................................................................
Rename `LexemeForm` to `Form` and `LexemeFormId` to `FormId`
Conforming to `Sense` naming to be consistent.
Change-Id: I0dd7d366f08f414094599d3cf9039d6c02516fe0
---
M src/Content/LexemeContent.php
R src/DataModel/Form.php
R src/DataModel/FormId.php
M src/DataModel/Lexeme.php
M src/DataModel/Serialization/LexemeDeserializer.php
M src/DataModel/Serialization/LexemeSerializer.php
M src/View/LexemeFormsView.php
M tests/phpunit/composer/DataModel/Serialization/LexemeDeserializerTest.php
M tests/phpunit/composer/DataModel/Serialization/LexemeSerializerTest.php
M tests/phpunit/mediawiki/View/LexemeFormsViewTest.php
10 files changed, 45 insertions(+), 46 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseLexeme
refs/changes/85/362185/1
diff --git a/src/Content/LexemeContent.php b/src/Content/LexemeContent.php
index f61d54c..1f03a79 100644
--- a/src/Content/LexemeContent.php
+++ b/src/Content/LexemeContent.php
@@ -20,8 +20,8 @@
use Wikibase\DataModel\Snak\PropertyValueSnak;
use Wikibase\DataModel\Statement\Statement;
use Wikibase\DataModel\Statement\StatementList;
-use Wikibase\Lexeme\DataModel\LexemeForm;
-use Wikibase\Lexeme\DataModel\LexemeFormId;
+use Wikibase\Lexeme\DataModel\Form;
+use Wikibase\Lexeme\DataModel\FormId;
/**
* @license GPL-2.0+
@@ -91,9 +91,9 @@
);
$forms = [
- new LexemeForm( new LexemeFormId( 'F1' ), 'A', [] ),
- new LexemeForm( new LexemeFormId( 'F2' ), 'B',
$grammaticalFeatures1, $statements1 ),
- new LexemeForm( new LexemeFormId( 'F3' ), 'C',
$grammaticalFeatures2, $statements2 ),
+ new Form( new FormId( 'F1' ), 'A', [] ),
+ new Form( new FormId( 'F2' ), 'B',
$grammaticalFeatures1, $statements1 ),
+ new Form( new FormId( 'F3' ), 'C',
$grammaticalFeatures2, $statements2 ),
];
$lexeme->setForms( $forms );
diff --git a/src/DataModel/LexemeForm.php b/src/DataModel/Form.php
similarity index 87%
rename from src/DataModel/LexemeForm.php
rename to src/DataModel/Form.php
index 4cdd739..06ac5a0 100644
--- a/src/DataModel/LexemeForm.php
+++ b/src/DataModel/Form.php
@@ -10,10 +10,10 @@
* @license GPL-2.0+
* @author Thiemo Mättig
*/
-class LexemeForm implements StatementListProvider {
+class Form implements StatementListProvider {
/**
- * @var LexemeFormId|null
+ * @var FormId|null
*/
private $id;
@@ -33,13 +33,13 @@
private $statementList;
/**
- * @param LexemeFormId $id |null
+ * @param FormId $id |null
* @param string $representation
* @param ItemId[] $grammaticalFeatures
* @param StatementList|null $statementList
*/
public function __construct(
- LexemeFormId $id = null,
+ FormId $id = null,
$representation,
array $grammaticalFeatures,
StatementList $statementList = null
@@ -51,7 +51,7 @@
}
/**
- * @return LexemeFormId|null
+ * @return FormId|null
*/
public function getId() {
return $this->id;
diff --git a/src/DataModel/LexemeFormId.php b/src/DataModel/FormId.php
similarity index 94%
rename from src/DataModel/LexemeFormId.php
rename to src/DataModel/FormId.php
index 0761355..0fe5ee5 100644
--- a/src/DataModel/LexemeFormId.php
+++ b/src/DataModel/FormId.php
@@ -6,7 +6,7 @@
* @license GPL-2.0+
* @author Thiemo Mättig
*/
-class LexemeFormId {
+class FormId {
/**
* @var string
diff --git a/src/DataModel/Lexeme.php b/src/DataModel/Lexeme.php
index 430ffde..28e44cb 100644
--- a/src/DataModel/Lexeme.php
+++ b/src/DataModel/Lexeme.php
@@ -44,7 +44,7 @@
private $language;
/**
- * @var LexemeForm[]
+ * @var Form[]
*/
private $forms;
@@ -63,7 +63,7 @@
* @param ItemId|null $lexicalCategory
* @param ItemId|null $language
* @param StatementList|null $statements
- * @param LexemeForm[] $forms
+ * @param Form[] $forms
* @oaram Sense[] $senses
*/
public function __construct(
@@ -234,14 +234,14 @@
}
/**
- * @return LexemeForm[]
+ * @return Form[]
*/
public function getForms() {
return $this->forms;
}
/**
- * @param LexemeForm[] $forms
+ * @param Form[] $forms
* @deprecated Temporary method, for demo. Just don't use.
*/
public function setForms( array $forms ) {
diff --git a/src/DataModel/Serialization/LexemeDeserializer.php
b/src/DataModel/Serialization/LexemeDeserializer.php
index 66bd6b3..6c1fe9f 100644
--- a/src/DataModel/Serialization/LexemeDeserializer.php
+++ b/src/DataModel/Serialization/LexemeDeserializer.php
@@ -9,8 +9,8 @@
use Wikibase\DataModel\Statement\StatementList;
use Wikibase\DataModel\Term\TermList;
use Wikibase\Lexeme\DataModel\Lexeme;
-use Wikibase\Lexeme\DataModel\LexemeForm;
-use Wikibase\Lexeme\DataModel\LexemeFormId;
+use Wikibase\Lexeme\DataModel\Form;
+use Wikibase\Lexeme\DataModel\FormId;
use Wikibase\Lexeme\DataModel\LexemeId;
/**
@@ -133,7 +133,7 @@
/**
* @param array $serialization
*
- * @return LexemeForm[]
+ * @return Form[]
*/
private function deserializeForms( array $serialization ) {
// TODO: Extract to a LexemeFormsDeserializer
@@ -151,18 +151,18 @@
/**
* @param array $serialization
*
- * @return LexemeForm
+ * @return Form
*/
private function deserializeForm( array $serialization ) {
$id = null;
if ( array_key_exists( 'id', $serialization ) ) {
// We may want to use an EntityIdDeserializer here
- $id = new LexemeFormId( $serialization['id'] );
+ $id = new FormId( $serialization['id'] );
}
// TODO: Throw proper exception if array key does not exist
- return new LexemeForm( $id, $serialization['representation'],
[] );
+ return new Form( $id, $serialization['representation'], [] );
}
}
diff --git a/src/DataModel/Serialization/LexemeSerializer.php
b/src/DataModel/Serialization/LexemeSerializer.php
index 82cb777..f9971d8 100644
--- a/src/DataModel/Serialization/LexemeSerializer.php
+++ b/src/DataModel/Serialization/LexemeSerializer.php
@@ -9,7 +9,7 @@
use UnexpectedValueException;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\Lexeme\DataModel\Lexeme;
-use Wikibase\Lexeme\DataModel\LexemeForm;
+use Wikibase\Lexeme\DataModel\Form;
use Wikibase\Lexeme\DataModel\Sense;
/**
@@ -109,7 +109,7 @@
}
/**
- * @param LexemeForm[] $forms
+ * @param Form[] $forms
*
* @return array[]
*/
@@ -124,11 +124,11 @@
}
/**
- * @param LexemeForm $form
+ * @param Form $form
*
* @return array
*/
- private function serializeForm( LexemeForm $form ) {
+ private function serializeForm( Form $form ) {
$serialization = [];
$id = $form->getId();
diff --git a/src/View/LexemeFormsView.php b/src/View/LexemeFormsView.php
index 5734c42..123e9db 100644
--- a/src/View/LexemeFormsView.php
+++ b/src/View/LexemeFormsView.php
@@ -3,7 +3,7 @@
namespace Wikibase\Lexeme\View;
use Wikibase\DataModel\Entity\ItemId;
-use Wikibase\Lexeme\DataModel\LexemeForm;
+use Wikibase\Lexeme\DataModel\Form;
use Wikibase\Lexeme\View\Template\LexemeTemplateFactory;
use Wikibase\Lib\EntityIdHtmlLinkFormatter;
use Wikibase\View\LocalizedTextProvider;
@@ -48,7 +48,7 @@
}
/**
- * @param LexemeForm[] $forms
+ * @param Form[] $forms
*
* @return string HTML
*/
@@ -71,11 +71,11 @@
}
/**
- * @param LexemeForm $form
+ * @param Form $form
*
* @return string HTML
*/
- private function getFormHtml( LexemeForm $form ) {
+ private function getFormHtml( Form $form ) {
$representation = $form->getRepresentation();
$grammaticalFeaturesHtml = $this->templateFactory->render(
diff --git
a/tests/phpunit/composer/DataModel/Serialization/LexemeDeserializerTest.php
b/tests/phpunit/composer/DataModel/Serialization/LexemeDeserializerTest.php
index 6a0728a..a57287e 100644
--- a/tests/phpunit/composer/DataModel/Serialization/LexemeDeserializerTest.php
+++ b/tests/phpunit/composer/DataModel/Serialization/LexemeDeserializerTest.php
@@ -13,8 +13,8 @@
use Wikibase\DataModel\Term\Term;
use Wikibase\DataModel\Term\TermList;
use Wikibase\Lexeme\DataModel\Lexeme;
-use Wikibase\Lexeme\DataModel\LexemeForm;
-use Wikibase\Lexeme\DataModel\LexemeFormId;
+use Wikibase\Lexeme\DataModel\Form;
+use Wikibase\Lexeme\DataModel\FormId;
use Wikibase\Lexeme\DataModel\LexemeId;
use Wikibase\Lexeme\DataModel\Serialization\LexemeDeserializer;
@@ -29,7 +29,6 @@
class LexemeDeserializerTest extends PHPUnit_Framework_TestCase {
private function newDeserializer() {
-
$entityIdDeserializer = $this->getMockBuilder(
EntityIdDeserializer::class )
->disableOriginalConstructor()
->getMock();
@@ -164,7 +163,7 @@
$lexeme
];
- $forms = [ new LexemeForm( null, 'form', [] ) ];
+ $forms = [ new Form( null, 'form', [] ) ];
$lexeme = new Lexeme( null, null, null, null, null, $forms );
$serializations['with minimal forms'] = [
[
@@ -175,7 +174,7 @@
];
//TODO: Test grammatical features (de)serialization
- $forms = [ new LexemeForm( new LexemeFormId( 'F5' ), 'form', []
) ];
+ $forms = [ new Form( new FormId( 'F5' ), 'form', [] ) ];
$lexeme = new Lexeme( new LexemeId( 'L5' ), null, null, null,
null, $forms );
$serializations['with forms and all IDs set'] = [
[
diff --git
a/tests/phpunit/composer/DataModel/Serialization/LexemeSerializerTest.php
b/tests/phpunit/composer/DataModel/Serialization/LexemeSerializerTest.php
index 2d3f133..9d5af5f 100644
--- a/tests/phpunit/composer/DataModel/Serialization/LexemeSerializerTest.php
+++ b/tests/phpunit/composer/DataModel/Serialization/LexemeSerializerTest.php
@@ -15,8 +15,8 @@
use Wikibase\DataModel\Term\Term;
use Wikibase\DataModel\Term\TermList;
use Wikibase\Lexeme\DataModel\Lexeme;
-use Wikibase\Lexeme\DataModel\LexemeForm;
-use Wikibase\Lexeme\DataModel\LexemeFormId;
+use Wikibase\Lexeme\DataModel\Form;
+use Wikibase\Lexeme\DataModel\FormId;
use Wikibase\Lexeme\DataModel\Sense;
use Wikibase\Lexeme\DataModel\SenseId;
use Wikibase\Lexeme\DataModel\Serialization\LexemeSerializer;
@@ -168,7 +168,7 @@
public function
testLexemeHasFormWithId_LexemeSerializationHasFormWithThatId() {
$lexeme = LexemeBuilder::create()->build();
- $lexeme->setForms( [ new LexemeForm( new LexemeFormId( 'F1' ),
'', [] ) ] );
+ $lexeme->setForms( [ new Form( new FormId( 'F1' ), '', [] ) ] );
$serialization = $this->newSerializer()->serialize( $lexeme );
@@ -180,7 +180,7 @@
public function
testLexemeFormWithRepresentation_SerializesFromRepresentation() {
$lexeme = LexemeBuilder::create()->build();
- $lexeme->setForms( [ new LexemeForm( null, 'some
representation', [] ) ] );
+ $lexeme->setForms( [ new Form( null, 'some representation', []
) ] );
$serialization = $this->newSerializer()->serialize( $lexeme );
@@ -197,7 +197,7 @@
public function testSerializesStatementsOnLexemeForms() {
$statement = new Statement( new PropertyNoValueSnak( new
PropertyId( 'P2' ) ) );
- $forms = [ new LexemeForm(
+ $forms = [ new Form(
null,
'some representation',
[],
@@ -214,7 +214,7 @@
}
public function testSerializeGrammaticalFeaturesOnLexemeForms() {
- $forms = [ new LexemeForm(
+ $forms = [ new Form(
null,
'some representation',
[ new ItemId( 'Q1' ) ]
diff --git a/tests/phpunit/mediawiki/View/LexemeFormsViewTest.php
b/tests/phpunit/mediawiki/View/LexemeFormsViewTest.php
index bf2c250..0af0a5b 100644
--- a/tests/phpunit/mediawiki/View/LexemeFormsViewTest.php
+++ b/tests/phpunit/mediawiki/View/LexemeFormsViewTest.php
@@ -6,8 +6,8 @@
use Prophecy\Argument;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\Services\Lookup\LabelDescriptionLookup;
-use Wikibase\Lexeme\DataModel\LexemeForm;
-use Wikibase\Lexeme\DataModel\LexemeFormId;
+use Wikibase\Lexeme\DataModel\Form;
+use Wikibase\Lexeme\DataModel\FormId;
use Wikibase\Lexeme\View\LexemeFormsView;
use Wikibase\Lexeme\View\Template\LexemeTemplateFactory;
use Wikibase\Lib\EntityIdHtmlLinkFormatter;
@@ -59,7 +59,7 @@
public function testHtmlContainsFormRepresentationWithIdAndLanguage() {
$view = $this->newFormsView();
$html = $view->getHtml( [
- new LexemeForm( new LexemeFormId( 'FORM_ID' ),
'FORM_REPRESENTATION', [] )
+ new Form( new FormId( 'FORM_ID' ),
'FORM_REPRESENTATION', [] )
] );
assertThat(
@@ -74,8 +74,8 @@
public function testHtmlContainsFormGrammaticalFeatures() {
$view = $this->newFormsView();
$grammaticalFeature = new ItemId( 'Q1' );
- $lexemeForm = new LexemeForm(
- new LexemeFormId( 'FORM_ID' ),
+ $lexemeForm = new Form(
+ new FormId( 'FORM_ID' ),
'FORM_REPRESENTATION',
[ $grammaticalFeature ]
);
@@ -91,7 +91,7 @@
public function testHtmlContainsStatementSection() {
$view = $this->newFormsView();
$html = $view->getHtml( [
- new LexemeForm( new LexemeFormId( 'FORM_ID' ),
'FORM_REPRESENTATION', [] )
+ new Form( new FormId( 'FORM_ID' ),
'FORM_REPRESENTATION', [] )
] );
assertThat(
--
To view, visit https://gerrit.wikimedia.org/r/362185
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0dd7d366f08f414094599d3cf9039d6c02516fe0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseLexeme
Gerrit-Branch: master
Gerrit-Owner: Aleksey Bekh-Ivanov (WMDE) <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
