Adrian Lang has uploaded a new change for review.
https://gerrit.wikimedia.org/r/180731
Change subject: Move Template{,Registry} to Wikibase\Template
......................................................................
Move Template{,Registry} to Wikibase\Template
Change-Id: I3d9d20eb7de9a72a7642a5b9033b29742a1f48c4
---
R repo/includes/Template/Template.php
M repo/includes/Template/TemplateFactory.php
R repo/includes/Template/TemplateRegistry.php
M repo/includes/WikibaseRepo.php
R repo/tests/phpunit/includes/Template/TemplateRegistryTest.php
R repo/tests/phpunit/includes/Template/TemplateTest.php
M repo/tests/phpunit/includes/View/ClaimHtmlGeneratorTest.php
M repo/tests/phpunit/includes/View/ClaimsViewTest.php
M repo/tests/phpunit/includes/View/EntityViewFactoryTest.php
M repo/tests/phpunit/includes/View/EntityViewPlaceholderExpanderTest.php
M repo/tests/phpunit/includes/View/FingerprintViewTest.php
M repo/tests/phpunit/includes/View/ItemViewTest.php
M repo/tests/phpunit/includes/View/PropertyViewTest.php
M repo/tests/phpunit/includes/View/SectionEditLinkGeneratorTest.php
M repo/tests/phpunit/includes/View/SiteLinksViewTest.php
M repo/tests/phpunit/includes/View/SnakHtmlGeneratorTest.php
M repo/tests/phpunit/includes/View/TermBoxViewTest.php
17 files changed, 25 insertions(+), 26 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/31/180731/1
diff --git a/repo/includes/Template.php b/repo/includes/Template/Template.php
similarity index 94%
rename from repo/includes/Template.php
rename to repo/includes/Template/Template.php
index 6e7ec71..02c85e1 100644
--- a/repo/includes/Template.php
+++ b/repo/includes/Template/Template.php
@@ -1,6 +1,8 @@
<?php
-namespace Wikibase;
+namespace Wikibase\Template;
+
+use Message;
/**
* Allows storing and accessing of templates (e.g. snippets commonly used in
server-side HTML
@@ -13,7 +15,7 @@
* @licence GNU GPL v2+
* @author H. Snater <[email protected]>
*/
-class Template extends \Message {
+class Template extends Message {
protected $templateRegistry;
diff --git a/repo/includes/Template/TemplateFactory.php
b/repo/includes/Template/TemplateFactory.php
index 7cc0a33..1b4d211 100644
--- a/repo/includes/Template/TemplateFactory.php
+++ b/repo/includes/Template/TemplateFactory.php
@@ -2,9 +2,6 @@
namespace Wikibase\Template;
-use Wikibase\Template;
-use Wikibase\TemplateRegistry;
-
/**
* @license GNU GPL v2+
* @author Adrian Lang < [email protected] >
diff --git a/repo/includes/TemplateRegistry.php
b/repo/includes/Template/TemplateRegistry.php
similarity index 91%
rename from repo/includes/TemplateRegistry.php
rename to repo/includes/Template/TemplateRegistry.php
index 33a326e..4a65e52 100644
--- a/repo/includes/TemplateRegistry.php
+++ b/repo/includes/Template/TemplateRegistry.php
@@ -1,6 +1,6 @@
<?php
-namespace Wikibase;
+namespace Wikibase\Template;
/**
* Allows storing and accessing of templates (e.g. snippets commonly used in
server-side HTML
@@ -29,7 +29,7 @@
public static function getDefaultInstance() {
if ( self::$instance === null ) {
self::$instance = new self();
- self::$instance->addTemplates( include( __DIR__ .
'/../resources/templates.php' ) );
+ self::$instance->addTemplates( include( __DIR__ .
'/../../resources/templates.php' ) );
}
return self::$instance;
}
diff --git a/repo/includes/WikibaseRepo.php b/repo/includes/WikibaseRepo.php
index c9b953c..5e180d6 100644
--- a/repo/includes/WikibaseRepo.php
+++ b/repo/includes/WikibaseRepo.php
@@ -78,7 +78,7 @@
use Wikibase\StringNormalizer;
use Wikibase\SummaryFormatter;
use Wikibase\Template\TemplateFactory;
-use Wikibase\TemplateRegistry;
+use Wikibase\Template\TemplateRegistry;
use Wikibase\Utils;
use Wikibase\Validators\EntityConstraintProvider;
use Wikibase\Validators\SnakValidator;
diff --git a/repo/tests/phpunit/TemplateRegistryTest.php
b/repo/tests/phpunit/includes/Template/TemplateRegistryTest.php
similarity index 89%
rename from repo/tests/phpunit/TemplateRegistryTest.php
rename to repo/tests/phpunit/includes/Template/TemplateRegistryTest.php
index 1ce31fb..8368c7f 100644
--- a/repo/tests/phpunit/TemplateRegistryTest.php
+++ b/repo/tests/phpunit/includes/Template/TemplateRegistryTest.php
@@ -1,11 +1,11 @@
<?php
-namespace Wikibase\Test;
+namespace Wikibase\Template\Test;
-use Wikibase\TemplateRegistry;
+use Wikibase\Template\TemplateRegistry;
/**
- * @covers Wikibase\TemplateRegistry
+ * @covers Wikibase\Template\TemplateRegistry
*
* @group Wikibase
* @group WikibaseLib
diff --git a/repo/tests/phpunit/TemplateTest.php
b/repo/tests/phpunit/includes/Template/TemplateTest.php
similarity index 80%
rename from repo/tests/phpunit/TemplateTest.php
rename to repo/tests/phpunit/includes/Template/TemplateTest.php
index 9814d54..7098c43 100644
--- a/repo/tests/phpunit/TemplateTest.php
+++ b/repo/tests/phpunit/includes/Template/TemplateTest.php
@@ -1,12 +1,12 @@
<?php
-namespace Wikibase\Test;
+namespace Wikibase\Template\Test;
-use Wikibase\Template;
-use Wikibase\TemplateRegistry;
+use Wikibase\Template\Template;
+use Wikibase\Template\TemplateRegistry;
/**
- * @covers Wikibase\Template
+ * @covers Wikibase\Template\Template
*
* @group Wikibase
* @group WikibaseLib
diff --git a/repo/tests/phpunit/includes/View/ClaimHtmlGeneratorTest.php
b/repo/tests/phpunit/includes/View/ClaimHtmlGeneratorTest.php
index 2a47ac3..1f9defc 100644
--- a/repo/tests/phpunit/includes/View/ClaimHtmlGeneratorTest.php
+++ b/repo/tests/phpunit/includes/View/ClaimHtmlGeneratorTest.php
@@ -18,7 +18,7 @@
use Wikibase\Repo\View\ClaimHtmlGenerator;
use Wikibase\Repo\View\SnakHtmlGenerator;
use Wikibase\Template\TemplateFactory;
-use Wikibase\TemplateRegistry;
+use Wikibase\Template\TemplateRegistry;
/**
* @covers Wikibase\ClaimHtmlGenerator
diff --git a/repo/tests/phpunit/includes/View/ClaimsViewTest.php
b/repo/tests/phpunit/includes/View/ClaimsViewTest.php
index 4744b8d..af01ad5 100644
--- a/repo/tests/phpunit/includes/View/ClaimsViewTest.php
+++ b/repo/tests/phpunit/includes/View/ClaimsViewTest.php
@@ -18,7 +18,7 @@
use Wikibase\Repo\View\ClaimsView;
use Wikibase\Repo\View\SectionEditLinkGenerator;
use Wikibase\Template\TemplateFactory;
-use Wikibase\TemplateRegistry;
+use Wikibase\Template\TemplateRegistry;
/**
* @covers Wikibase\Repo\View\ClaimsView
diff --git a/repo/tests/phpunit/includes/View/EntityViewFactoryTest.php
b/repo/tests/phpunit/includes/View/EntityViewFactoryTest.php
index f510bf2..0b92e47 100644
--- a/repo/tests/phpunit/includes/View/EntityViewFactoryTest.php
+++ b/repo/tests/phpunit/includes/View/EntityViewFactoryTest.php
@@ -7,7 +7,7 @@
use Wikibase\Lib\SnakFormatter;
use Wikibase\Repo\View\EntityViewFactory;
use Wikibase\Template\TemplateFactory;
-use Wikibase\TemplateRegistry;
+use Wikibase\Template\TemplateRegistry;
/**
* @licence GNU GPL v2+
diff --git
a/repo/tests/phpunit/includes/View/EntityViewPlaceholderExpanderTest.php
b/repo/tests/phpunit/includes/View/EntityViewPlaceholderExpanderTest.php
index 7975ae5..ff202c0 100644
--- a/repo/tests/phpunit/includes/View/EntityViewPlaceholderExpanderTest.php
+++ b/repo/tests/phpunit/includes/View/EntityViewPlaceholderExpanderTest.php
@@ -13,7 +13,7 @@
use Wikibase\Lib\Store\StorageException;
use Wikibase\Repo\View\EntityViewPlaceholderExpander;
use Wikibase\Template\TemplateFactory;
-use Wikibase\TemplateRegistry;
+use Wikibase\Template\TemplateRegistry;
/**
* @covers Wikibase\Repo\View\EntityViewPlaceholderExpander
diff --git a/repo/tests/phpunit/includes/View/FingerprintViewTest.php
b/repo/tests/phpunit/includes/View/FingerprintViewTest.php
index ecd0367..2985cd1 100644
--- a/repo/tests/phpunit/includes/View/FingerprintViewTest.php
+++ b/repo/tests/phpunit/includes/View/FingerprintViewTest.php
@@ -8,7 +8,7 @@
use Wikibase\Repo\View\FingerprintView;
use Wikibase\Repo\View\SectionEditLinkGenerator;
use Wikibase\Template\TemplateFactory;
-use Wikibase\TemplateRegistry;
+use Wikibase\Template\TemplateRegistry;
/**
* @covers Wikibase\Repo\View\FingerprintView
diff --git a/repo/tests/phpunit/includes/View/ItemViewTest.php
b/repo/tests/phpunit/includes/View/ItemViewTest.php
index 59ca464..95c2dd8 100644
--- a/repo/tests/phpunit/includes/View/ItemViewTest.php
+++ b/repo/tests/phpunit/includes/View/ItemViewTest.php
@@ -7,7 +7,7 @@
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\Repo\View\ItemView;
use Wikibase\Template\TemplateFactory;
-use Wikibase\TemplateRegistry;
+use Wikibase\Template\TemplateRegistry;
/**
* @covers Wikibase\Repo\View\ItemView
diff --git a/repo/tests/phpunit/includes/View/PropertyViewTest.php
b/repo/tests/phpunit/includes/View/PropertyViewTest.php
index 6ff3bcd..938c3e4 100644
--- a/repo/tests/phpunit/includes/View/PropertyViewTest.php
+++ b/repo/tests/phpunit/includes/View/PropertyViewTest.php
@@ -11,7 +11,7 @@
use Wikibase\DataModel\Statement\Statement;
use Wikibase\Repo\View\PropertyView;
use Wikibase\Template\TemplateFactory;
-use Wikibase\TemplateRegistry;
+use Wikibase\Template\TemplateRegistry;
/**
* @covers Wikibase\Repo\View\PropertyView
diff --git a/repo/tests/phpunit/includes/View/SectionEditLinkGeneratorTest.php
b/repo/tests/phpunit/includes/View/SectionEditLinkGeneratorTest.php
index 797a3b6..5b4d136 100644
--- a/repo/tests/phpunit/includes/View/SectionEditLinkGeneratorTest.php
+++ b/repo/tests/phpunit/includes/View/SectionEditLinkGeneratorTest.php
@@ -4,7 +4,7 @@
use Wikibase\Repo\View\SectionEditLinkGenerator;
use Wikibase\Template\TemplateFactory;
-use Wikibase\TemplateRegistry;
+use Wikibase\Template\TemplateRegistry;
/**
* @covers Wikibase\Repo\View\SectionEditLinkGenerator
diff --git a/repo/tests/phpunit/includes/View/SiteLinksViewTest.php
b/repo/tests/phpunit/includes/View/SiteLinksViewTest.php
index 8d343bb..06425d3 100644
--- a/repo/tests/phpunit/includes/View/SiteLinksViewTest.php
+++ b/repo/tests/phpunit/includes/View/SiteLinksViewTest.php
@@ -13,7 +13,7 @@
use Wikibase\Repo\View\SectionEditLinkGenerator;
use Wikibase\Repo\View\SiteLinksView;
use Wikibase\Template\TemplateFactory;
-use Wikibase\TemplateRegistry;
+use Wikibase\Template\TemplateRegistry;
/**
* @covers Wikibase\Repo\View\SiteLinksView
diff --git a/repo/tests/phpunit/includes/View/SnakHtmlGeneratorTest.php
b/repo/tests/phpunit/includes/View/SnakHtmlGeneratorTest.php
index 10645c3..f14b42f 100644
--- a/repo/tests/phpunit/includes/View/SnakHtmlGeneratorTest.php
+++ b/repo/tests/phpunit/includes/View/SnakHtmlGeneratorTest.php
@@ -13,7 +13,7 @@
use Wikibase\Lib\SnakFormatter;
use Wikibase\Repo\View\SnakHtmlGenerator;
use Wikibase\Template\TemplateFactory;
-use Wikibase\TemplateRegistry;
+use Wikibase\Template\TemplateRegistry;
/**
* @covers Wikibase\Repo\View\SnakHtmlGenerator
diff --git a/repo/tests/phpunit/includes/View/TermBoxViewTest.php
b/repo/tests/phpunit/includes/View/TermBoxViewTest.php
index ebaf28d..0e81fac 100644
--- a/repo/tests/phpunit/includes/View/TermBoxViewTest.php
+++ b/repo/tests/phpunit/includes/View/TermBoxViewTest.php
@@ -8,7 +8,7 @@
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\Repo\View\TermBoxView;
use Wikibase\Template\TemplateFactory;
-use Wikibase\TemplateRegistry;
+use Wikibase\Template\TemplateRegistry;
/**
* @covers Wikibase\Repo\View\TermBoxView
--
To view, visit https://gerrit.wikimedia.org/r/180731
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3d9d20eb7de9a72a7642a5b9033b29742a1f48c4
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
