From d38dc5dfaa5859e9a8e723a72622e024a9e84533 Mon Sep 17 00:00:00 2001
From: Aaron Schulz <aschulz@wikimedia.org>
Date: Sun, 8 Sep 2019 15:01:45 -0700
Subject: [PATCH] filebackend: replace wfTimestamp() calls with
 ConvertibleTimestamp::convert()

Change-Id: I4bef0fc377a928cf403d2bc187ed0a10154feb18
---
 includes/libs/filebackend/MemoryFileBackend.php | 7 ++++---
 includes/libs/filebackend/fsfile/FSFile.php     | 9 +++++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/includes/libs/filebackend/MemoryFileBackend.php b/includes/libs/filebackend/MemoryFileBackend.php
index f3bbecb814..82f196263f 100644
--- a/includes/libs/filebackend/MemoryFileBackend.php
+++ b/includes/libs/filebackend/MemoryFileBackend.php
@@ -22,6 +22,7 @@
  */
 
 use Wikimedia\AtEase\AtEase;
+use Wikimedia\Timestamp\ConvertibleTimestamp;
 
 /**
  * Simulation of a backend storage in memory.
@@ -56,7 +57,7 @@ class MemoryFileBackend extends FileBackendStore {
 
 		$this->files[$dst] = [
 			'data' => $params['content'],
-			'mtime' => wfTimestamp( TS_MW, time() )
+			'mtime' => ConvertibleTimestamp::convert( TS_MW, time() )
 		];
 
 		return $status;
@@ -83,7 +84,7 @@ class MemoryFileBackend extends FileBackendStore {
 
 		$this->files[$dst] = [
 			'data' => $data,
-			'mtime' => wfTimestamp( TS_MW, time() )
+			'mtime' => ConvertibleTimestamp::convert( TS_MW, time() )
 		];
 
 		return $status;
@@ -116,7 +117,7 @@ class MemoryFileBackend extends FileBackendStore {
 
 		$this->files[$dst] = [
 			'data' => $this->files[$src]['data'],
-			'mtime' => wfTimestamp( TS_MW, time() )
+			'mtime' => ConvertibleTimestamp::convert( TS_MW, time() )
 		];
 
 		return $status;
diff --git a/includes/libs/filebackend/fsfile/FSFile.php b/includes/libs/filebackend/fsfile/FSFile.php
index 1937e37441..cce32baccc 100644
--- a/includes/libs/filebackend/fsfile/FSFile.php
+++ b/includes/libs/filebackend/fsfile/FSFile.php
@@ -22,6 +22,7 @@
  */
 
 use Wikimedia\AtEase\AtEase;
+use Wikimedia\Timestamp\ConvertibleTimestamp;
 
 /**
  * Class representing a non-directory file on the file system
@@ -68,7 +69,11 @@ class FSFile {
 	 * @return int|bool
 	 */
 	public function getSize() {
-		return filesize( $this->path );
+		AtEase::suppressWarnings();
+		$size = filesize( $this->path );
+		AtEase::restoreWarnings();
+
+		return $size;
 	}
 
 	/**
@@ -81,7 +86,7 @@ class FSFile {
 		$timestamp = filemtime( $this->path );
 		AtEase::restoreWarnings();
 		if ( $timestamp !== false ) {
-			$timestamp = wfTimestamp( TS_MW, $timestamp );
+			$timestamp = ConvertibleTimestamp::convert( TS_MW, $timestamp );
 		}
 
 		return $timestamp;
-- 
2.20.1