Adrian Lang has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200826
Change subject: Move Wikibase\Repo\View to Wikibase\View
......................................................................
Move Wikibase\Repo\View to Wikibase\View
Change-Id: Ie0bd5ce523608d1e8dc4ed7ad5199764982b8ae7
---
M composer.json
M repo/includes/EntityParserOutputGenerator.php
M repo/includes/EntityParserOutputGeneratorFactory.php
M repo/includes/WikibaseRepo.php
M repo/tests/phpunit/includes/EntityParserOutputGeneratorTest.php
M view/src/ClaimHtmlGenerator.php
M view/src/EditSectionGenerator.php
M view/src/EmptyEditSectionGenerator.php
M view/src/EntityTermsView.php
M view/src/EntityView.php
M view/src/EntityViewFactory.php
M view/src/EntityViewPlaceholderExpander.php
M view/src/ItemView.php
M view/src/PropertyView.php
M view/src/SiteLinksView.php
M view/src/SnakHtmlGenerator.php
M view/src/StatementGroupListView.php
M view/src/TextInjector.php
M view/src/ToolbarEditSectionGenerator.php
M view/tests/phpunit/ClaimHtmlGeneratorTest.php
M view/tests/phpunit/ClaimsViewTest.php
M view/tests/phpunit/EmptyEditSectionGeneratorTest.php
M view/tests/phpunit/EntityTermsViewTest.php
M view/tests/phpunit/EntityViewFactoryTest.php
M view/tests/phpunit/EntityViewPlaceholderExpanderTest.php
M view/tests/phpunit/EntityViewTest.php
M view/tests/phpunit/ItemViewTest.php
M view/tests/phpunit/PropertyViewTest.php
M view/tests/phpunit/SiteLinksViewTest.php
M view/tests/phpunit/SnakHtmlGeneratorTest.php
M view/tests/phpunit/TextInjectorTest.php
M view/tests/phpunit/ToolbarEditSectionGeneratorTest.php
32 files changed, 97 insertions(+), 116 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/26/200826/1
diff --git a/composer.json b/composer.json
index 4835316..7b02206 100644
--- a/composer.json
+++ b/composer.json
@@ -66,7 +66,6 @@
"repo/Wikibase.hooks.php"
],
"psr-4": {
- "Wikibase\\Repo\\View\\": "view/src",
"Wikibase\\View\\": "view/src"
}
}
diff --git a/repo/includes/EntityParserOutputGenerator.php
b/repo/includes/EntityParserOutputGenerator.php
index 5e2f424..54858ee 100644
--- a/repo/includes/EntityParserOutputGenerator.php
+++ b/repo/includes/EntityParserOutputGenerator.php
@@ -20,11 +20,11 @@
use Wikibase\Lib\Store\EntityInfoTermLookup;
use Wikibase\Lib\Store\EntityTitleLookup;
use Wikibase\Lib\Store\LanguageFallbackLabelLookup;
-use Wikibase\Repo\View\EmptyEditSectionGenerator;
-use Wikibase\Repo\View\EntityViewFactory;
use Wikibase\Repo\View\RepoSpecialPageLinker;
-use Wikibase\Repo\View\ToolbarEditSectionGenerator;
use Wikibase\Template\TemplateFactory;
+use Wikibase\View\EmptyEditSectionGenerator;
+use Wikibase\View\EntityViewFactory;
+use Wikibase\View\ToolbarEditSectionGenerator;
/**
* Creates the parser output for an entity.
diff --git a/repo/includes/EntityParserOutputGeneratorFactory.php
b/repo/includes/EntityParserOutputGeneratorFactory.php
index de2f03f..1a8faa1 100644
--- a/repo/includes/EntityParserOutputGeneratorFactory.php
+++ b/repo/includes/EntityParserOutputGeneratorFactory.php
@@ -8,8 +8,8 @@
use Wikibase\Lib\Serializers\SerializationOptions;
use Wikibase\Lib\Store\EntityInfoBuilderFactory;
use Wikibase\Lib\Store\EntityTitleLookup;
-use Wikibase\Repo\View\EntityViewFactory;
use Wikibase\Template\TemplateFactory;
+use Wikibase\View\EntityViewFactory;
/**
* @since 0.5
diff --git a/repo/includes/WikibaseRepo.php b/repo/includes/WikibaseRepo.php
index f52297a..0fd0c42 100644
--- a/repo/includes/WikibaseRepo.php
+++ b/repo/includes/WikibaseRepo.php
@@ -70,7 +70,6 @@
use Wikibase\Repo\Notifications\DatabaseChangeTransmitter;
use Wikibase\Repo\Notifications\DummyChangeTransmitter;
use Wikibase\Repo\Store\EntityPermissionChecker;
-use Wikibase\Repo\View\EntityViewFactory;
use Wikibase\Settings;
use Wikibase\SettingsArray;
use Wikibase\SnakFactory;
@@ -88,6 +87,7 @@
use Wikibase\Validators\TermValidatorFactory;
use Wikibase\Validators\ValidatorErrorLocalizer;
use Wikibase\ValuesFinder;
+use Wikibase\View\EntityViewFactory;
/**
* Top level factory for the WikibaseRepo extension.
diff --git a/repo/tests/phpunit/includes/EntityParserOutputGeneratorTest.php
b/repo/tests/phpunit/includes/EntityParserOutputGeneratorTest.php
index 6fc6326..fbf24fb 100644
--- a/repo/tests/phpunit/includes/EntityParserOutputGeneratorTest.php
+++ b/repo/tests/phpunit/includes/EntityParserOutputGeneratorTest.php
@@ -160,11 +160,11 @@
}
private function getEntityViewFactory() {
- $entityViewFactory = $this->getMockBuilder(
'Wikibase\Repo\View\EntityViewFactory' )
+ $entityViewFactory = $this->getMockBuilder(
'Wikibase\View\EntityViewFactory' )
->disableOriginalConstructor()
->getMock();
- $entityView = $this->getMockBuilder(
'Wikibase\Repo\View\EntityView' )
+ $entityView = $this->getMockBuilder( 'Wikibase\View\EntityView'
)
->disableOriginalConstructor()
->getMock();
diff --git a/view/src/ClaimHtmlGenerator.php b/view/src/ClaimHtmlGenerator.php
index d937f38..981f95a 100644
--- a/view/src/ClaimHtmlGenerator.php
+++ b/view/src/ClaimHtmlGenerator.php
@@ -1,6 +1,6 @@
<?php
-namespace Wikibase\Repo\View;
+namespace Wikibase\View;
use Wikibase\DataModel\ByPropertyIdArray;
use Wikibase\DataModel\Claim\Claim;
diff --git a/view/src/EditSectionGenerator.php
b/view/src/EditSectionGenerator.php
index 8d3732f..00cdafb 100644
--- a/view/src/EditSectionGenerator.php
+++ b/view/src/EditSectionGenerator.php
@@ -1,6 +1,6 @@
<?php
-namespace Wikibase\Repo\View;
+namespace Wikibase\View;
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\PropertyId;
diff --git a/view/src/EmptyEditSectionGenerator.php
b/view/src/EmptyEditSectionGenerator.php
index 347944a..bddec22 100644
--- a/view/src/EmptyEditSectionGenerator.php
+++ b/view/src/EmptyEditSectionGenerator.php
@@ -1,6 +1,6 @@
<?php
-namespace Wikibase\Repo\View;
+namespace Wikibase\View;
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\PropertyId;
diff --git a/view/src/EntityTermsView.php b/view/src/EntityTermsView.php
index 88ee5bb..19a9ec6 100644
--- a/view/src/EntityTermsView.php
+++ b/view/src/EntityTermsView.php
@@ -1,6 +1,6 @@
<?php
-namespace Wikibase\Repo\View;
+namespace Wikibase\View;
use Message;
use Title;
diff --git a/view/src/EntityView.php b/view/src/EntityView.php
index 97d0a8b..ed319869 100644
--- a/view/src/EntityView.php
+++ b/view/src/EntityView.php
@@ -1,6 +1,6 @@
<?php
-namespace Wikibase\Repo\View;
+namespace Wikibase\View;
use Html;
use InvalidArgumentException;
diff --git a/view/src/EntityViewFactory.php b/view/src/EntityViewFactory.php
index 084d327..123bd60 100644
--- a/view/src/EntityViewFactory.php
+++ b/view/src/EntityViewFactory.php
@@ -1,6 +1,6 @@
<?php
-namespace Wikibase\Repo\View;
+namespace Wikibase\View;
use DataTypes\DataTypeFactory;
use InvalidArgumentException;
@@ -13,8 +13,6 @@
use Wikibase\Lib\Store\EntityLookup;
use Wikibase\Lib\Store\LabelLookup;
use Wikibase\Template\TemplateFactory;
-use Wikibase\View\EntityIdFormatterFactory;
-use Wikibase\View\HtmlSnakFormatterFactory;
/**
* @since 0.5
diff --git a/view/src/EntityViewPlaceholderExpander.php
b/view/src/EntityViewPlaceholderExpander.php
index dccee0e..49fb360 100644
--- a/view/src/EntityViewPlaceholderExpander.php
+++ b/view/src/EntityViewPlaceholderExpander.php
@@ -1,6 +1,6 @@
<?php
-namespace Wikibase\Repo\View;
+namespace Wikibase\View;
use InvalidArgumentException;
use Language;
diff --git a/view/src/ItemView.php b/view/src/ItemView.php
index dd1fc44..8637030 100644
--- a/view/src/ItemView.php
+++ b/view/src/ItemView.php
@@ -1,6 +1,6 @@
<?php
-namespace Wikibase\Repo\View;
+namespace Wikibase\View;
use InvalidArgumentException;
use Language;
diff --git a/view/src/PropertyView.php b/view/src/PropertyView.php
index 7fe11dc..b652fb9 100644
--- a/view/src/PropertyView.php
+++ b/view/src/PropertyView.php
@@ -1,6 +1,6 @@
<?php
-namespace Wikibase\Repo\View;
+namespace Wikibase\View;
use DataTypes\DataType;
use DataTypes\DataTypeFactory;
diff --git a/view/src/SiteLinksView.php b/view/src/SiteLinksView.php
index 4478a7d..dc28bc5 100644
--- a/view/src/SiteLinksView.php
+++ b/view/src/SiteLinksView.php
@@ -1,17 +1,16 @@
<?php
-namespace Wikibase\Repo\View;
+namespace Wikibase\View;
use InvalidArgumentException;
-use Message;
use Sanitizer;
use Site;
use SiteList;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\SiteLink;
use Wikibase\DataModel\Term\FingerprintProvider;
-use Wikibase\Lib\Store\EntityLookup;
use Wikibase\Lib\LanguageNameLookup;
+use Wikibase\Lib\Store\EntityLookup;
use Wikibase\Template\TemplateFactory;
/**
diff --git a/view/src/SnakHtmlGenerator.php b/view/src/SnakHtmlGenerator.php
index 3dfe89f..7f4934e 100644
--- a/view/src/SnakHtmlGenerator.php
+++ b/view/src/SnakHtmlGenerator.php
@@ -1,6 +1,6 @@
<?php
-namespace Wikibase\Repo\View;
+namespace Wikibase\View;
use InvalidArgumentException;
use ValueFormatters\FormattingException;
diff --git a/view/src/StatementGroupListView.php
b/view/src/StatementGroupListView.php
index 87ef27d..52667d5 100644
--- a/view/src/StatementGroupListView.php
+++ b/view/src/StatementGroupListView.php
@@ -1,9 +1,8 @@
<?php
-namespace Wikibase\Repo\View;
+namespace Wikibase\View;
use Wikibase\DataModel\Claim\Claim;
-use Wikibase\DataModel\Entity\PropertyId;
use Wikibase\DataModel\Statement\Statement;
use Wikibase\Lib\EntityIdFormatter;
use Wikibase\Template\TemplateFactory;
diff --git a/view/src/TextInjector.php b/view/src/TextInjector.php
index 8595a45..fa72e26 100644
--- a/view/src/TextInjector.php
+++ b/view/src/TextInjector.php
@@ -1,6 +1,6 @@
<?php
-namespace Wikibase\Repo\View;
+namespace Wikibase\View;
/**
* Helper for injecting text by substituting placeholders.
diff --git a/view/src/ToolbarEditSectionGenerator.php
b/view/src/ToolbarEditSectionGenerator.php
index 5c8928c..6b88cb5 100644
--- a/view/src/ToolbarEditSectionGenerator.php
+++ b/view/src/ToolbarEditSectionGenerator.php
@@ -1,6 +1,6 @@
<?php
-namespace Wikibase\Repo\View;
+namespace Wikibase\View;
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\PropertyId;
diff --git a/view/tests/phpunit/ClaimHtmlGeneratorTest.php
b/view/tests/phpunit/ClaimHtmlGeneratorTest.php
index 2478337..87babf7 100644
--- a/view/tests/phpunit/ClaimHtmlGeneratorTest.php
+++ b/view/tests/phpunit/ClaimHtmlGeneratorTest.php
@@ -14,18 +14,18 @@
use Wikibase\DataModel\Snak\SnakList;
use Wikibase\DataModel\Statement\Statement;
use Wikibase\Lib\EntityIdFormatter;
-use Wikibase\Repo\View\ClaimHtmlGenerator;
-use Wikibase\Repo\View\SnakHtmlGenerator;
use Wikibase\Template\TemplateFactory;
use Wikibase\Template\TemplateRegistry;
+use Wikibase\View\ClaimHtmlGenerator;
+use Wikibase\View\SnakHtmlGenerator;
/**
- * @covers Wikibase\Repo\View\ClaimHtmlGenerator
+ * @covers Wikibase\View\ClaimHtmlGenerator
*
* @todo more specific tests for all parts of claim html formatting
*
* @group Wikibase
- * @group WikibaseRepo
+ * @group WikibaseView
*
* @licence GNU GPL v2+
* @author Katie Filbert < aude.w...@gmail.com >
@@ -38,7 +38,7 @@
* @return SnakHtmlGenerator
*/
protected function getSnakHtmlGeneratorMock() {
- $snakHtmlGenerator = $this->getMockBuilder(
'Wikibase\Repo\View\SnakHtmlGenerator' )
+ $snakHtmlGenerator = $this->getMockBuilder(
'Wikibase\View\SnakHtmlGenerator' )
->disableOriginalConstructor()
->getMock();
diff --git a/view/tests/phpunit/ClaimsViewTest.php
b/view/tests/phpunit/ClaimsViewTest.php
index d2183a5..4713536 100644
--- a/view/tests/phpunit/ClaimsViewTest.php
+++ b/view/tests/phpunit/ClaimsViewTest.php
@@ -15,16 +15,16 @@
use Wikibase\DataModel\Snak\PropertyValueSnak;
use Wikibase\DataModel\Snak\Snak;
use Wikibase\Lib\EntityIdFormatter;
-use Wikibase\Repo\View\ClaimHtmlGenerator;
-use Wikibase\Repo\View\StatementGroupListView;
use Wikibase\Template\TemplateFactory;
use Wikibase\Template\TemplateRegistry;
+use Wikibase\View\ClaimHtmlGenerator;
+use Wikibase\View\StatementGroupListView;
/**
- * @covers Wikibase\Repo\View\StatementGroupListView
+ * @covers Wikibase\View\StatementGroupListView
*
* @group Wikibase
- * @group WikibaseRepo
+ * @group WikibaseView
*
* @licence GNU GPL v2+
* @author Bene* < benestar.wikime...@gmail.com >
@@ -41,10 +41,10 @@
}
/**
- * @uses Wikibase\Repo\View\SectionEditLinkGenerator
* @uses Wikibase\Template\Template
* @uses Wikibase\Template\TemplateFactory
* @uses Wikibase\Template\TemplateRegistry
+ * @uses Wikibase\View\EditSectionGenerator
*/
public function testGetHtml() {
$propertyId = new PropertyId( 'P77' );
@@ -127,7 +127,7 @@
return new StatementGroupListView(
$templateFactory,
$propertyIdFormatter,
- $this->getMock(
'Wikibase\Repo\View\EditSectionGenerator' ),
+ $this->getMock( 'Wikibase\View\EditSectionGenerator' ),
$this->getClaimHtmlGenerator()
);
}
@@ -136,7 +136,7 @@
* @return ClaimHtmlGenerator
*/
private function getClaimHtmlGenerator() {
- $claimHtmlGenerator = $this->getMockBuilder(
'Wikibase\Repo\View\ClaimHtmlGenerator' )
+ $claimHtmlGenerator = $this->getMockBuilder(
'Wikibase\View\ClaimHtmlGenerator' )
->disableOriginalConstructor()
->getMock();
diff --git a/view/tests/phpunit/EmptyEditSectionGeneratorTest.php
b/view/tests/phpunit/EmptyEditSectionGeneratorTest.php
index de4fe42..f0166af 100644
--- a/view/tests/phpunit/EmptyEditSectionGeneratorTest.php
+++ b/view/tests/phpunit/EmptyEditSectionGeneratorTest.php
@@ -7,14 +7,13 @@
use Wikibase\DataModel\Entity\PropertyId;
use Wikibase\DataModel\Snak\PropertyNoValueSnak;
use Wikibase\DataModel\Statement\Statement;
-use Wikibase\Repo\View\EmptyEditSectionGenerator;
+use Wikibase\View\EmptyEditSectionGenerator;
/**
- * @covers Wikibase\Repo\View\EmptyEditSectionGeneratorTest
+ * @covers Wikibase\View\EmptyEditSectionGenerator
*
* @group Wikibase
- * @group WikibaseRepo
- * @group EntityView
+ * @group WikibaseView
*
* @licence GNU GPL v2+
* @author Adrian Heine < adrian.he...@wikimedia.de >
diff --git a/view/tests/phpunit/EntityTermsViewTest.php
b/view/tests/phpunit/EntityTermsViewTest.php
index 81b63bd..e7e323a 100644
--- a/view/tests/phpunit/EntityTermsViewTest.php
+++ b/view/tests/phpunit/EntityTermsViewTest.php
@@ -6,22 +6,21 @@
use MessageCache;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\Term\Fingerprint;
-use Wikibase\Repo\View\EntityTermsView;
-use Wikibase\Repo\View\TextInjector;
use Wikibase\Template\TemplateFactory;
use Wikibase\Template\TemplateRegistry;
+use Wikibase\View\EntityTermsView;
+use Wikibase\View\TextInjector;
/**
- * @covers Wikibase\Repo\View\EntityTermsView
+ * @covers Wikibase\View\EntityTermsView
*
- * @uses Wikibase\Repo\View\TextInjector
* @uses Wikibase\Template\Template
* @uses Wikibase\Template\TemplateFactory
* @uses Wikibase\Template\TemplateRegistry
+ * @uses Wikibase\View\TextInjector
*
* @group Wikibase
- * @group WikibaseRepo
- * @group Database
+ * @group WikibaseView
*
* @licence GNU GPL v2+
* @author Bene* < benestar.wikime...@gmail.com >
@@ -55,7 +54,7 @@
$called = $this->any();
}
- $editSectionGenerator = $this->getMock(
'Wikibase\Repo\View\EditSectionGenerator' );
+ $editSectionGenerator = $this->getMock(
'Wikibase\View\EditSectionGenerator' );
$editSectionGenerator->expects( $called )
->method( 'getLabelDescriptionAliasesEditSection' )
diff --git a/view/tests/phpunit/EntityViewFactoryTest.php
b/view/tests/phpunit/EntityViewFactoryTest.php
index 94e0c96..52b72c5 100644
--- a/view/tests/phpunit/EntityViewFactoryTest.php
+++ b/view/tests/phpunit/EntityViewFactoryTest.php
@@ -6,29 +6,29 @@
use SiteList;
use Wikibase\LanguageFallbackChain;
use Wikibase\Lib\SnakFormatter;
-use Wikibase\Repo\View\EntityViewFactory;
use Wikibase\Template\TemplateFactory;
use Wikibase\Template\TemplateRegistry;
+use Wikibase\View\EntityViewFactory;
/**
- * @covers \Wikibase\Repo\View\EntityViewFactory
+ * @covers Wikibase\View\EntityViewFactory
*
- * @uses Wikibase\Repo\View\ClaimHtmlGenerator
- * @uses Wikibase\Repo\View\EntityTermsView
- * @uses Wikibase\Repo\View\EntityView
- * @uses Wikibase\Repo\View\ItemView
- * @uses Wikibase\Repo\View\PropertyView
- * @uses Wikibase\Repo\View\SectionEditLinkGenerator
- * @uses Wikibase\Repo\View\SiteLinksView
- * @uses Wikibase\Repo\View\StatementGroupListView
- * @uses Wikibase\Repo\View\SnakHtmlGenerator
- * @uses Wikibase\Repo\View\TextInjector
* @uses Wikibase\Template\Template
* @uses Wikibase\Template\TemplateFactory
* @uses Wikibase\Template\TemplateRegistry
+ * @uses Wikibase\View\ClaimHtmlGenerator
+ * @uses Wikibase\View\EditSectionGenerator
+ * @uses Wikibase\View\EntityTermsView
+ * @uses Wikibase\View\EntityView
+ * @uses Wikibase\View\ItemView
+ * @uses Wikibase\View\PropertyView
+ * @uses Wikibase\View\SiteLinksView
+ * @uses Wikibase\View\StatementGroupListView
+ * @uses Wikibase\View\SnakHtmlGenerator
+ * @uses Wikibase\View\TextInjector
*
* @group Wikibase
- * @group WikibaseRepo
+ * @group WikibaseView
*
* @licence GNU GPL v2+
* @author Katie Filbert < aude.w...@gmail.com >
@@ -48,7 +48,7 @@
'de',
$this->getMock( 'Wikibase\Lib\Store\LabelLookup' ),
$languageFallback,
- $this->getMock(
'Wikibase\Repo\View\EditSectionGenerator' )
+ $this->getMock( 'Wikibase\View\EditSectionGenerator' )
);
$this->assertInstanceOf( $expectedClass, $entityView );
@@ -56,8 +56,8 @@
public function newEntityViewProvider() {
return array(
- array( 'Wikibase\Repo\View\ItemView', 'item' ),
- array( 'Wikibase\Repo\View\PropertyView', 'property' )
+ array( 'Wikibase\View\ItemView', 'item' ),
+ array( 'Wikibase\View\PropertyView', 'property' )
);
}
@@ -73,7 +73,7 @@
'de',
$this->getMock( 'Wikibase\Lib\Store\LabelLookup' ),
$languageFallback,
- $this->getMock(
'Wikibase\Repo\View\EditSectionGenerator' )
+ $this->getMock( 'Wikibase\View\EditSectionGenerator' )
);
}
diff --git a/view/tests/phpunit/EntityViewPlaceholderExpanderTest.php
b/view/tests/phpunit/EntityViewPlaceholderExpanderTest.php
index af9f6f7..4e436a0 100644
--- a/view/tests/phpunit/EntityViewPlaceholderExpanderTest.php
+++ b/view/tests/phpunit/EntityViewPlaceholderExpanderTest.php
@@ -12,22 +12,20 @@
use Wikibase\Lib\Store\EntityRevisionLookup;
use Wikibase\Lib\Store\StorageException;
use Wikibase\Lib\WikibaseContentLanguages;
-use Wikibase\Repo\View\EntityViewPlaceholderExpander;
use Wikibase\Template\TemplateFactory;
use Wikibase\Template\TemplateRegistry;
+use Wikibase\View\EntityViewPlaceholderExpander;
/**
- * @covers Wikibase\Repo\View\EntityViewPlaceholderExpander
+ * @covers Wikibase\View\EntityViewPlaceholderExpander
*
- * @uses Wikibase\Repo\View\EntityTermsView
* @uses Wikibase\Template\Template
* @uses Wikibase\Template\TemplateFactory
* @uses Wikibase\Template\TemplateRegistry
+ * @uses Wikibase\View\EntityTermsView
*
* @group Wikibase
- * @group WikibaseRepo
- * @group EntityView
- * @group Database
+ * @group WikibaseView
*
* @licence GNU GPL v2+
* @author Daniel Kinzler
diff --git a/view/tests/phpunit/EntityViewTest.php
b/view/tests/phpunit/EntityViewTest.php
index 551b48d..21836df 100644
--- a/view/tests/phpunit/EntityViewTest.php
+++ b/view/tests/phpunit/EntityViewTest.php
@@ -7,14 +7,13 @@
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Statement\Statement;
use Wikibase\EntityRevision;
-use Wikibase\Repo\View\EntityView;
+use Wikibase\View\EntityView;
/**
- * @covers Wikibase\Repo\View\EntityView
+ * @covers Wikibase\View\EntityView
*
* @group Wikibase
- * @group WikibaseRepo
- * @group EntityView
+ * @group WikibaseView
*
* @licence GNU GPL v2+
* @author H. Snater < mediaw...@snater.com >
diff --git a/view/tests/phpunit/ItemViewTest.php
b/view/tests/phpunit/ItemViewTest.php
index 093bb66..2c64c51 100644
--- a/view/tests/phpunit/ItemViewTest.php
+++ b/view/tests/phpunit/ItemViewTest.php
@@ -5,27 +5,24 @@
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
-use Wikibase\Repo\View\ItemView;
use Wikibase\Template\TemplateFactory;
use Wikibase\Template\TemplateRegistry;
+use Wikibase\View\ItemView;
/**
- * @covers Wikibase\Repo\View\ItemView
- * @covers Wikibase\Repo\View\EntityView
+ * @covers Wikibase\View\ItemView
+ * @covers Wikibase\View\EntityView
*
- * @uses Wikibase\Repo\View\TextInjector
* @uses Wikibase\Template\Template
* @uses Wikibase\Template\TemplateFactory
* @uses Wikibase\Template\TemplateRegistry
+ * @uses Wikibase\View\TextInjector
*
* @group Wikibase
- * @group WikibaseItemView
+ * @group WikibaseView
*
* @licence GNU GPL v2+
* @author Daniel Kinzler
- *
- * @group Database
- * @group medium
*/
class ItemViewTest extends EntityViewTest {
@@ -55,14 +52,14 @@
public function provideTestGetHtml() {
$itemView = new ItemView(
new TemplateFactory(
TemplateRegistry::getDefaultInstance() ),
- $this->getMockBuilder(
'Wikibase\Repo\View\EntityTermsView' )
+ $this->getMockBuilder( 'Wikibase\View\EntityTermsView' )
->disableOriginalConstructor()
->getMock(),
- $this->getMockBuilder(
'Wikibase\Repo\View\StatementGroupListView' )
+ $this->getMockBuilder(
'Wikibase\View\StatementGroupListView' )
->disableOriginalConstructor()
->getMock(),
$this->getMock( 'Language' ),
- $this->getMockBuilder(
'Wikibase\Repo\View\SiteLinksView' )
+ $this->getMockBuilder( 'Wikibase\View\SiteLinksView' )
->disableOriginalConstructor()
->getMock(),
array()
diff --git a/view/tests/phpunit/PropertyViewTest.php
b/view/tests/phpunit/PropertyViewTest.php
index 04778e3..76d09d0 100644
--- a/view/tests/phpunit/PropertyViewTest.php
+++ b/view/tests/phpunit/PropertyViewTest.php
@@ -9,27 +9,24 @@
use Wikibase\DataModel\Entity\Property;
use Wikibase\DataModel\Entity\PropertyId;
use Wikibase\DataModel\Statement\Statement;
-use Wikibase\Repo\View\PropertyView;
use Wikibase\Template\TemplateFactory;
use Wikibase\Template\TemplateRegistry;
+use Wikibase\View\PropertyView;
/**
- * @covers Wikibase\Repo\View\PropertyView
- * @covers Wikibase\Repo\View\EntityView
+ * @covers Wikibase\View\EntityView
+ * @covers Wikibase\View\PropertyView
*
- * @uses Wikibase\Repo\View\TextInjector
* @uses Wikibase\Template\Template
* @uses Wikibase\Template\TemplateFactory
* @uses Wikibase\Template\TemplateRegistry
+ * @uses Wikibase\View\TextInjector
*
* @group Wikibase
- * @group WikibasePropertyView
+ * @group WikibaseView
*
* @licence GNU GPL v2+
* @author Daniel Kinzler
- *
- * @group Database
- * @group medium
*/
class PropertyViewTest extends EntityViewTest {
@@ -85,10 +82,10 @@
public function provideTestGetHtml() {
$propertyView = new PropertyView(
new TemplateFactory(
TemplateRegistry::getDefaultInstance() ),
- $this->getMockBuilder(
'Wikibase\Repo\View\EntityTermsView' )
+ $this->getMockBuilder( 'Wikibase\View\EntityTermsView' )
->disableOriginalConstructor()
->getMock(),
- $this->getMockBuilder(
'Wikibase\Repo\View\StatementGroupListView' )
+ $this->getMockBuilder(
'Wikibase\View\StatementGroupListView' )
->disableOriginalConstructor()
->getMock(),
$this->getDataTypeFactory(),
diff --git a/view/tests/phpunit/SiteLinksViewTest.php
b/view/tests/phpunit/SiteLinksViewTest.php
index 16c68c3..40c27ac 100644
--- a/view/tests/phpunit/SiteLinksViewTest.php
+++ b/view/tests/phpunit/SiteLinksViewTest.php
@@ -11,24 +11,23 @@
use Wikibase\DataModel\SiteLink;
use Wikibase\Lib\LanguageNameLookup;
use Wikibase\Lib\Store\EntityLookup;
-use Wikibase\Repo\View\EditSectionGenerator;
-use Wikibase\Repo\View\SiteLinksView;
use Wikibase\Template\TemplateFactory;
use Wikibase\Template\TemplateRegistry;
+use Wikibase\View\EditSectionGenerator;
+use Wikibase\View\SiteLinksView;
/**
- * @covers Wikibase\Repo\View\SiteLinksView
+ * @covers Wikibase\View\SiteLinksView
*
* @uses Wikibase\Template\Template
* @uses Wikibase\Template\TemplateFactory
* @uses Wikibase\Template\TemplateRegistry
*
* @group Wikibase
- * @group WikibaseRepo
- * @group Database
+ * @group WikibaseView
*
* @licence GNU GPL v2+
- * @author Adrian Lang <adrian.l...@wikimedia.de>
+ * @author Adrian Heine <adrian.he...@wikimedia.de>
* @author Bene* < benestar.wikime...@gmail.com >
*/
class SiteLinksViewTest extends \MediaWikiTestCase {
@@ -181,7 +180,7 @@
* @return EditSectionGenerator
*/
private function getEditSectionGeneratorMock() {
- $editSectionGenerator = $this->getMock(
'Wikibase\Repo\View\EditSectionGenerator' );
+ $editSectionGenerator = $this->getMock(
'Wikibase\View\EditSectionGenerator' );
return $editSectionGenerator;
}
diff --git a/view/tests/phpunit/SnakHtmlGeneratorTest.php
b/view/tests/phpunit/SnakHtmlGeneratorTest.php
index c03171a..59b91f4 100644
--- a/view/tests/phpunit/SnakHtmlGeneratorTest.php
+++ b/view/tests/phpunit/SnakHtmlGeneratorTest.php
@@ -11,19 +11,19 @@
use Wikibase\DataModel\Snak\Snak;
use Wikibase\Lib\EntityIdFormatter;
use Wikibase\Lib\SnakFormatter;
-use Wikibase\Repo\View\SnakHtmlGenerator;
use Wikibase\Template\TemplateFactory;
use Wikibase\Template\TemplateRegistry;
+use Wikibase\View\SnakHtmlGenerator;
/**
- * @covers Wikibase\Repo\View\SnakHtmlGenerator
+ * @covers Wikibase\View\SnakHtmlGenerator
*
* @uses Wikibase\Template\Template
* @uses Wikibase\Template\TemplateFactory
* @uses Wikibase\Template\TemplateRegistry
*
* @group Wikibase
- * @group WikibaseRepo
+ * @group WikibaseView
*
* @licence GNU GPL v2+
* @author Katie Filbert < aude.w...@gmail.com >
diff --git a/view/tests/phpunit/TextInjectorTest.php
b/view/tests/phpunit/TextInjectorTest.php
index f894327..6633fae 100644
--- a/view/tests/phpunit/TextInjectorTest.php
+++ b/view/tests/phpunit/TextInjectorTest.php
@@ -2,14 +2,13 @@
namespace Wikibase\Test;
-use Wikibase\Repo\View\TextInjector;
+use Wikibase\View\TextInjector;
/**
- * @covers Wikibase\Repo\View\TextInjector
+ * @covers Wikibase\View\TextInjector
*
* @group Wikibase
- * @group WikibaseRepo
- * @group EntityView
+ * @group WikibaseView
*
* @licence GNU GPL v2+
* @author Daniel Kinzler
diff --git a/view/tests/phpunit/ToolbarEditSectionGeneratorTest.php
b/view/tests/phpunit/ToolbarEditSectionGeneratorTest.php
index 6d0d14f..73a3043 100644
--- a/view/tests/phpunit/ToolbarEditSectionGeneratorTest.php
+++ b/view/tests/phpunit/ToolbarEditSectionGeneratorTest.php
@@ -9,20 +9,19 @@
use Wikibase\DataModel\Entity\PropertyId;
use Wikibase\DataModel\Snak\PropertyNoValueSnak;
use Wikibase\DataModel\Statement\Statement;
-use Wikibase\Repo\View\ToolbarEditSectionGenerator;
use Wikibase\Template\TemplateFactory;
use Wikibase\Template\TemplateRegistry;
+use Wikibase\View\ToolbarEditSectionGenerator;
/**
- * @covers Wikibase\Repo\View\ToolbarEditSectionGeneratorTest
+ * @covers Wikibase\View\ToolbarEditSectionGenerator
*
* @uses Wikibase\Template\Template
* @uses Wikibase\Template\TemplateFactory
* @uses Wikibase\Template\TemplateRegistry
*
* @group Wikibase
- * @group WikibaseRepo
- * @group EntityView
+ * @group WikibaseView
*
* @licence GNU GPL v2+
* @author Katie Filbert < aude.w...@gmail.com >
--
To view, visit https://gerrit.wikimedia.org/r/200826
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie0bd5ce523608d1e8dc4ed7ad5199764982b8ae7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang <adrian.he...@wikimedia.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
