[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Use HTML formatter to output monolingual wikitext

[WMDE]

Thiemo Mättig (WMDE) has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371170 )

Change subject: Use HTML formatter to output monolingual wikitext
......................................................................

Use HTML formatter to output monolingual wikitext

The HTML this formatter outputs is valid wikitext, or am I missing
anything here?

Change-Id: Ie820a6da323f5165f1f8dbdd1e170d3f00d4548a
---
M lib/includes/Formatters/MonolingualHtmlFormatter.php
M lib/includes/Formatters/WikibaseValueFormatterBuilders.php
M lib/tests/phpunit/Formatters/MonolingualHtmlFormatterTest.php
M lib/tests/phpunit/Formatters/WikibaseValueFormatterBuildersTest.php
4 files changed, 14 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/70/371170/1

diff --git a/lib/includes/Formatters/MonolingualHtmlFormatter.php 
b/lib/includes/Formatters/MonolingualHtmlFormatter.php
index 90f18d4..1b9dc82 100644
--- a/lib/includes/Formatters/MonolingualHtmlFormatter.php
+++ b/lib/includes/Formatters/MonolingualHtmlFormatter.php
@@ -20,10 +20,10 @@
        private $languageNameLookup;
 
        /**
-        * @param FormatterOptions|null $options
+        * @param FormatterOptions $options
         * @param LanguageNameLookup $languageNameLookup
         */
-       public function __construct( FormatterOptions $options = null, 
LanguageNameLookup $languageNameLookup ) {
+       public function __construct( FormatterOptions $options, 
LanguageNameLookup $languageNameLookup ) {
                parent::__construct( $options );
 
                $this->languageNameLookup = $languageNameLookup;
diff --git a/lib/includes/Formatters/WikibaseValueFormatterBuilders.php 
b/lib/includes/Formatters/WikibaseValueFormatterBuilders.php
index d92aabf..727ff63 100644
--- a/lib/includes/Formatters/WikibaseValueFormatterBuilders.php
+++ b/lib/includes/Formatters/WikibaseValueFormatterBuilders.php
@@ -390,11 +390,10 @@
         * @return MonolingualHtmlFormatter
         */
        public function newMonolingualFormatter( $format, FormatterOptions 
$options ) {
-               // TODO: Add a wikitext formatter that shows the language name
-               if ( $this->isHtmlFormat( $format ) ) {
-                       return new MonolingualHtmlFormatter( $options, 
$this->languageNameLookup );
+               if ( $format === SnakFormatter::FORMAT_PLAIN ) {
+                       return new MonolingualTextFormatter( $options );
                } else {
-                       return $this->escapeValueFormatter( $format, new 
MonolingualTextFormatter( $options ) );
+                       return new MonolingualHtmlFormatter( $options, 
$this->languageNameLookup );
                }
        }
 
diff --git a/lib/tests/phpunit/Formatters/MonolingualHtmlFormatterTest.php 
b/lib/tests/phpunit/Formatters/MonolingualHtmlFormatterTest.php
index 6f1acfc..0ce16f6 100644
--- a/lib/tests/phpunit/Formatters/MonolingualHtmlFormatterTest.php
+++ b/lib/tests/phpunit/Formatters/MonolingualHtmlFormatterTest.php
@@ -24,7 +24,7 @@
        /**
         * @dataProvider monolingualHtmlFormatProvider
         */
-       public function testFormat( $value, $options, $pattern, $not = '' ) {
+       public function testFormat( MonolingualTextValue $value, 
FormatterOptions $options, $pattern, $not = '' ) {
                $languageNameLookup = $this->getMock( LanguageNameLookup::class 
);
                $languageNameLookup->expects( $this->any() )
                        ->method( 'getName' )
diff --git 
a/lib/tests/phpunit/Formatters/WikibaseValueFormatterBuildersTest.php 
b/lib/tests/phpunit/Formatters/WikibaseValueFormatterBuildersTest.php
index 4412039..6ca45c2 100644
--- a/lib/tests/phpunit/Formatters/WikibaseValueFormatterBuildersTest.php
+++ b/lib/tests/phpunit/Formatters/WikibaseValueFormatterBuildersTest.php
@@ -422,7 +422,14 @@
                                SnakFormatter::FORMAT_HTML,
                                $this->newFormatterOptions( 'en' ),
                                new MonolingualTextValue( 'de', 'Hallo Welt' ),
-                               '/^.*lang="de".*?>Hallo Welt<.*Deutsch.*$/'
+                               '/ lang="de".*>Hallo Welt<.*Deutsch/'
+                       ],
+                       'wikitext monolingual text' => [
+                               'Monolingual',
+                               SnakFormatter::FORMAT_WIKI,
+                               $this->newFormatterOptions( 'en' ),
+                               new MonolingualTextValue( 'de', 'Hallo Welt' ),
+                               '/ lang="de".*>Hallo Welt<.*Deutsch/'
                        ],
                ];
        }

-- 
To view, visit https://gerrit.wikimedia.org/r/371170
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie820a6da323f5165f1f8dbdd1e170d3f00d4548a
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