[MediaWiki-commits] [Gerrit] Rename MwTimeIsoFormatter to TimeFormatter - change (mediawiki...Wikibase)

[Addshore (Code Review)]

Addshore has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/126219

Change subject: Rename MwTimeIsoFormatter to TimeFormatter
......................................................................

Rename MwTimeIsoFormatter to TimeFormatter

Change-Id: I6b2a2a7d05cd95c510329278d7b31070751f6fb9
---
M lib/includes/formatters/TimeDetailsFormatter.php
R lib/includes/formatters/TimeFormatter.php
M lib/includes/formatters/WikibaseValueFormatterBuilders.php
M lib/tests/phpunit/formatters/MwTimeIsoFormatterTest.php
4 files changed, 11 insertions(+), 8 deletions(-)


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

diff --git a/lib/includes/formatters/TimeDetailsFormatter.php 
b/lib/includes/formatters/TimeDetailsFormatter.php
index 5e5a021..b6ff00e 100644
--- a/lib/includes/formatters/TimeDetailsFormatter.php
+++ b/lib/includes/formatters/TimeDetailsFormatter.php
@@ -22,7 +22,7 @@
 class TimeDetailsFormatter extends ValueFormatterBase {
 
        /**
-        * @var MwTimeIsoFormatter
+        * @var TimeFormatter
         */
        protected $isoTimeFormatter;
 
@@ -40,7 +40,7 @@
                if ( $options->hasOption( TimeFormatter::OPT_TIME_ISO_FORMATTER 
) ) {
                        $this->isoTimeFormatter = $options->getOption( 
TimeFormatter::OPT_TIME_ISO_FORMATTER );
                } else {
-                       $this->isoTimeFormatter = new MwTimeIsoFormatter( 
$options );
+                       $this->isoTimeFormatter = new TimeFormatter( $options );
                        $options->setOption( 
TimeFormatter::OPT_TIME_ISO_FORMATTER, $this->isoTimeFormatter );
                }
 
diff --git a/lib/includes/formatters/MwTimeIsoFormatter.php 
b/lib/includes/formatters/TimeFormatter.php
similarity index 96%
rename from lib/includes/formatters/MwTimeIsoFormatter.php
rename to lib/includes/formatters/TimeFormatter.php
index 8524943..203a5f2 100644
--- a/lib/includes/formatters/MwTimeIsoFormatter.php
+++ b/lib/includes/formatters/TimeFormatter.php
@@ -18,7 +18,7 @@
  *
  * @todo move me to DataValues-time
  */
-class MwTimeIsoFormatter extends ValueFormatterBase {
+class TimeFormatter extends ValueFormatterBase {
 
        /**
         * MediaWiki language object.
@@ -63,8 +63,11 @@
                 * [8] => 02
                 * [9] => 03
                 */
-               $regexSuccess = preg_match( 
'/^(\+|\-)((\d{0,12})?(\d{4}))-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})Z/',
-                       $extendedIsoTimestamp, $matches );
+               $regexSuccess = preg_match(
+                       
'/^(\+|\-)((\d{0,12})?(\d{4}))-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})Z/',
+                       $extendedIsoTimestamp,
+                       $matches
+               );
 
                if( !$regexSuccess || intval( $matches[2] ) === 0 ) {
                        return $extendedIsoTimestamp;
diff --git a/lib/includes/formatters/WikibaseValueFormatterBuilders.php 
b/lib/includes/formatters/WikibaseValueFormatterBuilders.php
index 8bc4477..8b83d74 100644
--- a/lib/includes/formatters/WikibaseValueFormatterBuilders.php
+++ b/lib/includes/formatters/WikibaseValueFormatterBuilders.php
@@ -525,7 +525,7 @@
         * @return HtmlTimeFormatter
         */
        private static function newHtmlTimeFormatter( FormatterOptions 
$options, WikibaseValueFormatterBuilders $builders ) {
-               return new HtmlTimeFormatter( $options, new MwTimeIsoFormatter( 
$options ) );
+               return new HtmlTimeFormatter( $options, new TimeFormatter( 
$options ) );
        }
 
        /**
diff --git a/lib/tests/phpunit/formatters/MwTimeIsoFormatterTest.php 
b/lib/tests/phpunit/formatters/MwTimeIsoFormatterTest.php
index feb0913..09f33ce 100644
--- a/lib/tests/phpunit/formatters/MwTimeIsoFormatterTest.php
+++ b/lib/tests/phpunit/formatters/MwTimeIsoFormatterTest.php
@@ -8,7 +8,7 @@
 use ValueFormatters\FormatterOptions;
 use ValueParsers\ParserOptions;
 use ValueParsers\ValueParser;
-use Wikibase\Lib\MwTimeIsoFormatter;
+use Wikibase\Lib\TimeFormatter;
 use Wikibase\Lib\Parsers\TimeParser;
 use Wikibase\Utils;
 
@@ -327,7 +327,7 @@
                        ValueFormatter::OPT_LANG => $langCode
                ) );
 
-               $isoFormatter = new MwTimeIsoFormatter( $options );
+               $isoFormatter = new TimeFormatter( $options );
 
                $formattedTime = $isoFormatter->format( $timeValue );
                $this->assertEquals( $expected, $formattedTime );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6b2a2a7d05cd95c510329278d7b31070751f6fb9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Addshore <addshorew...@gmail.com>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits