From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Mon, 9 Sep 2019 20:10:19 +0000 (+0000)
Subject: Merge "filebackend: replace wfTimestamp() calls with ConvertibleTimestamp::convert()"
X-Git-Tag: 1.34.0-rc.0~300
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=48c448a94dd6d0555a3173ed60e19bd01e34a644;hp=93d9da40d3153ee8f63ffbd7bc72f08d62e11efd

Merge "filebackend: replace wfTimestamp() calls with ConvertibleTimestamp::convert()"
---

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;