XMPValidate: Use ConvertibleTimestamp instead of wfTimestamp()
authorKunal Mehta <legoktm@member.fsf.org>
Wed, 21 Sep 2016 03:09:03 +0000 (20:09 -0700)
committerKunal Mehta <legoktm@member.fsf.org>
Wed, 21 Sep 2016 03:09:03 +0000 (20:09 -0700)
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

includes/media/XMPValidate.php

index fe47f47..32a3340 100644 (file)
@@ -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'.