From: Kunal Mehta <legoktm@member.fsf.org>
Date: Wed, 21 Sep 2016 03:09:03 +0000 (-0700)
Subject: XMPValidate: Use ConvertibleTimestamp instead of wfTimestamp()
X-Git-Tag: 1.31.0-rc.0~5431^2
X-Git-Url: http://git.cyclocoop.org/%27%20.generer_url_ecrire%28_request%28%27exec%27%29%2C%27cmd=switch&outil=rss_couteau_suisse%27%29.%27?a=commitdiff_plain;h=cd5b41ef565eca99e41c3797ff3bafd15578f982;p=lhc%2Fweb%2Fwiklou.git

XMPValidate: Use ConvertibleTimestamp instead of wfTimestamp()

This removes the last MediaWiki dependency in the XMP* classes, and they
can now be moved to libs/ (in a follow up patch).

Change-Id: Iee509fce0e44ec0697e1cdd4cd711846cf35e1e6
---

diff --git a/includes/media/XMPValidate.php b/includes/media/XMPValidate.php
index fe47f4740e..32a3340fa1 100644
--- a/includes/media/XMPValidate.php
+++ b/includes/media/XMPValidate.php
@@ -329,13 +329,15 @@ class XMPValidate implements LoggerAwareInterface {
 			// We know that if we got to this step, year, month day hour and min must be set
 			// by virtue of regex not failing.
 
-			$unix = wfTimestamp( TS_UNIX, $res[1] . $res[2] . $res[3] . $res[4] . $res[5] . $res[6] );
+			$unix = ( new ConvertableTimestamp(
+				$res[1] . $res[2] . $res[3] . $res[4] . $res[5] . $res[6]
+			) )->getTimestamp( TS_UNIX );
 			$offset = intval( substr( $res[7], 1, 2 ) ) * 60 * 60;
 			$offset += intval( substr( $res[7], 4, 2 ) ) * 60;
 			if ( substr( $res[7], 0, 1 ) === '-' ) {
 				$offset = -$offset;
 			}
-			$val = wfTimestamp( TS_EXIF, $unix + $offset );
+			$val = ( new ConvertableTimestamp( $unix + $offset ) )->getTimestamp( TS_EXIF );
 
 			if ( $stripSeconds ) {
 				// If seconds weren't specified, remove the trailing ':00'.