Adrian Lang has uploaded a new change for review.
https://gerrit.wikimedia.org/r/176234
Change subject: Move {Entity,Property,Item}View to Wikibase\Repo\View
......................................................................
Move {Entity,Property,Item}View to Wikibase\Repo\View
Change-Id: I42cdba5ccd507a530fd9a56cda29739577994da3
---
R repo/includes/View/EntityView.php
M repo/includes/View/EntityViewFactory.php
R repo/includes/View/ItemView.php
R repo/includes/View/PropertyView.php
M repo/tests/phpunit/includes/EntityParserOutputGeneratorTest.php
M repo/tests/phpunit/includes/View/EntityViewFactoryTest.php
R repo/tests/phpunit/includes/View/EntityViewTest.php
R repo/tests/phpunit/includes/View/ItemViewTest.php
R repo/tests/phpunit/includes/View/PropertyViewTest.php
9 files changed, 15 insertions(+), 20 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/34/176234/1
diff --git a/repo/includes/EntityView.php b/repo/includes/View/EntityView.php
similarity index 97%
rename from repo/includes/EntityView.php
rename to repo/includes/View/EntityView.php
index 137a03c..ee53a3b 100644
--- a/repo/includes/EntityView.php
+++ b/repo/includes/View/EntityView.php
@@ -1,14 +1,12 @@
<?php
-namespace Wikibase;
+namespace Wikibase\Repo\View;
use Html;
use InvalidArgumentException;
use Language;
use Wikibase\DataModel\Entity\Entity;
-use Wikibase\Repo\View\ClaimsView;
-use Wikibase\Repo\View\FingerprintView;
-use Wikibase\Repo\View\TextInjector;
+use Wikibase\EntityRevision;
/**
* Base class for creating views for all different kinds of Wikibase\Entity.
diff --git a/repo/includes/View/EntityViewFactory.php
b/repo/includes/View/EntityViewFactory.php
index 5a047c2..95cd0f5 100644
--- a/repo/includes/View/EntityViewFactory.php
+++ b/repo/includes/View/EntityViewFactory.php
@@ -6,15 +6,12 @@
use Language;
use ValueFormatters\FormatterOptions;
use ValueFormatters\ValueFormatter;
-use Wikibase\EntityView;
-use Wikibase\ItemView;
use Wikibase\LanguageFallbackChain;
use Wikibase\Lib\OutputFormatSnakFormatterFactory;
use Wikibase\Lib\SnakFormatter;
use Wikibase\Lib\Store\EntityLookup;
use Wikibase\Lib\Store\EntityTitleLookup;
use Wikibase\Lib\Store\LabelLookup;
-use Wikibase\PropertyView;
/**
* @since 0.5
diff --git a/repo/includes/ItemView.php b/repo/includes/View/ItemView.php
similarity index 95%
rename from repo/includes/ItemView.php
rename to repo/includes/View/ItemView.php
index e506d21..a3946ef 100644
--- a/repo/includes/ItemView.php
+++ b/repo/includes/View/ItemView.php
@@ -1,11 +1,10 @@
<?php
-namespace Wikibase;
+namespace Wikibase\Repo\View;
use InvalidArgumentException;
use Wikibase\DataModel\Entity\Item;
-use Wikibase\Repo\View\SectionEditLinkGenerator;
-use Wikibase\Repo\View\SiteLinksView;
+use Wikibase\EntityRevision;
use Wikibase\Repo\WikibaseRepo;
/**
diff --git a/repo/includes/PropertyView.php
b/repo/includes/View/PropertyView.php
similarity index 96%
rename from repo/includes/PropertyView.php
rename to repo/includes/View/PropertyView.php
index 6e8786b..742cfc0 100644
--- a/repo/includes/PropertyView.php
+++ b/repo/includes/View/PropertyView.php
@@ -1,10 +1,11 @@
<?php
-namespace Wikibase;
+namespace Wikibase\Repo\View;
use DataTypes\DataType;
use InvalidArgumentException;
use Wikibase\DataModel\Entity\Property;
+use Wikibase\EntityRevision;
use Wikibase\Repo\WikibaseRepo;
/**
diff --git a/repo/tests/phpunit/includes/EntityParserOutputGeneratorTest.php
b/repo/tests/phpunit/includes/EntityParserOutputGeneratorTest.php
index 66210a3..cc43627 100644
--- a/repo/tests/phpunit/includes/EntityParserOutputGeneratorTest.php
+++ b/repo/tests/phpunit/includes/EntityParserOutputGeneratorTest.php
@@ -77,7 +77,7 @@
->disableOriginalConstructor()
->getMock();
- $entityView = $this->getMockBuilder( 'Wikibase\EntityView' )
+ $entityView = $this->getMockBuilder(
'Wikibase\Repo\View\EntityView' )
->disableOriginalConstructor()
->getMock();
diff --git a/repo/tests/phpunit/includes/View/EntityViewFactoryTest.php
b/repo/tests/phpunit/includes/View/EntityViewFactoryTest.php
index ff72816..979cdb4 100644
--- a/repo/tests/phpunit/includes/View/EntityViewFactoryTest.php
+++ b/repo/tests/phpunit/includes/View/EntityViewFactoryTest.php
@@ -38,8 +38,8 @@
public function newEntityViewProvider() {
return array(
- array( 'Wikibase\ItemView', 'item' ),
- array( 'Wikibase\PropertyView', 'property' )
+ array( 'Wikibase\Repo\View\ItemView', 'item' ),
+ array( 'Wikibase\Repo\View\PropertyView', 'property' )
);
}
diff --git a/repo/tests/phpunit/includes/EntityViewTest.php
b/repo/tests/phpunit/includes/View/EntityViewTest.php
similarity index 98%
rename from repo/tests/phpunit/includes/EntityViewTest.php
rename to repo/tests/phpunit/includes/View/EntityViewTest.php
index 65917c9..1199d45 100644
--- a/repo/tests/phpunit/includes/EntityViewTest.php
+++ b/repo/tests/phpunit/includes/View/EntityViewTest.php
@@ -21,7 +21,6 @@
use Wikibase\DataModel\Snak\Snak;
use Wikibase\DataModel\Statement\Statement;
use Wikibase\EntityRevision;
-use Wikibase\EntityView;
use Wikibase\LanguageFallbackChain;
use Wikibase\Lib\Serializers\SerializationOptions;
use Wikibase\Lib\SnakFormatter;
@@ -29,11 +28,12 @@
use Wikibase\Lib\Store\EntityTitleLookup;
use Wikibase\ParserOutputJsConfigBuilder;
use Wikibase\ReferencedEntitiesFinder;
+use Wikibase\Repo\View\EntityView;
use Wikibase\Repo\WikibaseRepo;
use Wikibase\Utils;
/**
- * @covers Wikibase\EntityView
+ * @covers Wikibase\Repo\View\EntityView
*
* @group Wikibase
* @group WikibaseRepo
diff --git a/repo/tests/phpunit/includes/ItemViewTest.php
b/repo/tests/phpunit/includes/View/ItemViewTest.php
similarity index 91%
rename from repo/tests/phpunit/includes/ItemViewTest.php
rename to repo/tests/phpunit/includes/View/ItemViewTest.php
index 298d32e..a28d330 100644
--- a/repo/tests/phpunit/includes/ItemViewTest.php
+++ b/repo/tests/phpunit/includes/View/ItemViewTest.php
@@ -8,7 +8,7 @@
use Wikibase\DataModel\Statement\Statement;
/**
- * @covers Wikibase\ItemView
+ * @covers Wikibase\Repo\View\ItemView
*
* @group Wikibase
* @group WikibaseItemView
@@ -22,7 +22,7 @@
class ItemViewTest extends EntityViewTest {
protected function getEntityViewClass() {
- return 'Wikibase\ItemView';
+ return 'Wikibase\Repo\View\ItemView';
}
/**
diff --git a/repo/tests/phpunit/includes/PropertyViewTest.php
b/repo/tests/phpunit/includes/View/PropertyViewTest.php
similarity index 93%
rename from repo/tests/phpunit/includes/PropertyViewTest.php
rename to repo/tests/phpunit/includes/View/PropertyViewTest.php
index 9dad8e3..3265fc1 100644
--- a/repo/tests/phpunit/includes/PropertyViewTest.php
+++ b/repo/tests/phpunit/includes/View/PropertyViewTest.php
@@ -9,7 +9,7 @@
use Wikibase\DataModel\Statement\Statement;
/**
- * @covers Wikibase\PropertyView
+ * @covers Wikibase\Repo\View\PropertyView
*
* @group Wikibase
* @group WikibasePropertyView
@@ -23,7 +23,7 @@
class PropertyViewTest extends EntityViewTest {
protected function getEntityViewClass() {
- return 'Wikibase\PropertyView';
+ return 'Wikibase\Repo\View\PropertyView';
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/176234
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I42cdba5ccd507a530fd9a56cda29739577994da3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
