Thiemo Mättig (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/187129
Change subject: Introduce TemplateFactory::getTemplates
......................................................................
Introduce TemplateFactory::getTemplates
This is one of many steps. This patch introduces a method necesarry
to get rid of the last call of TemplateRegistry::getDefaultInstance.
Change-Id: I84fcba5f11fbff19e8c6d22e5a1d5a9ff07065df
---
M repo/includes/Template/TemplateFactory.php
M repo/includes/modules/TemplateModule.php
2 files changed, 11 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/29/187129/1
diff --git a/repo/includes/Template/TemplateFactory.php
b/repo/includes/Template/TemplateFactory.php
index f0fd441..b0f1863 100644
--- a/repo/includes/Template/TemplateFactory.php
+++ b/repo/includes/Template/TemplateFactory.php
@@ -35,8 +35,16 @@
}
/**
+ * @return string[] Array containing all raw template strings.
+ */
+ public function getTemplates() {
+ return $this->templateRegistry->getTemplates();
+ }
+
+ /**
* @param string $key
* @param array $params
+ *
* @return Template
*/
public function get( $key, array $params ) {
diff --git a/repo/includes/modules/TemplateModule.php
b/repo/includes/modules/TemplateModule.php
index eba92d5..5b57020 100644
--- a/repo/includes/modules/TemplateModule.php
+++ b/repo/includes/modules/TemplateModule.php
@@ -5,7 +5,7 @@
use FormatJson;
use ResourceLoaderContext;
use ResourceLoaderFileModule;
-use Wikibase\Template\TemplateRegistry;
+use Wikibase\Template\TemplateFactory;
/**
* Injects templates into JavaScript.
@@ -27,8 +27,8 @@
*/
public function getScript( ResourceLoaderContext $context ) {
// register HTML templates
- $templateRegistry = TemplateRegistry::getDefaultInstance();
- $templatesJson = FormatJson::encode(
$templateRegistry->getTemplates() );
+ $templateFactory = TemplateFactory::getDefaultInstance();
+ $templatesJson = FormatJson::encode(
$templateFactory->getTemplates() );
// template store JavaScript initialisation
$script = <<<EOT
--
To view, visit https://gerrit.wikimedia.org/r/187129
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I84fcba5f11fbff19e8c6d22e5a1d5a9ff07065df
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <thiemo.maet...@wikimedia.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
