X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Flibs%2Ffilebackend%2FFileBackendStore.php;h=97da5572fd3c0b21a69691969cb4ae1fc7892ff6;hb=a38af7ba26579bb3004f673e44d39710887763aa;hp=0403725d540668c1c9acd7ef35e59fd6193c1fa7;hpb=4077b57759756ecd0d25427ec9598feb28a28ac1;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/libs/filebackend/FileBackendStore.php b/includes/libs/filebackend/FileBackendStore.php
index 0403725d54..97da5572fd 100644
--- a/includes/libs/filebackend/FileBackendStore.php
+++ b/includes/libs/filebackend/FileBackendStore.php
@@ -626,25 +626,41 @@ abstract class FileBackendStore extends FileBackend {
 			return false; // invalid storage path
 		}
 		$ps = $this->scopedProfileSection( __METHOD__ . "-{$this->name}" );
+
 		$latest = !empty( $params['latest'] ); // use latest data?
-		if ( !$latest && !$this->cheapCache->hasField( $path, 'stat', self::CACHE_TTL ) ) {
-			$this->primeFileCache( [ $path ] ); // check persistent cache
+		$requireSHA1 = !empty( $params['requireSHA1'] ); // require SHA-1 if file exists?
+
+		if ( !$latest ) {
+			$stat = $this->cheapCache->getField( $path, 'stat', self::CACHE_TTL );
+			// Note that some backends, like SwiftFileBackend, sometimes set file stat process
+			// cache entries from mass object listings that do not include the SHA-1. In that
+			// case, loading the persistent stat cache will likely yield the SHA-1.
+			if (
+				$stat === null ||
+				( $requireSHA1 && is_array( $stat ) && !isset( $stat['sha1'] ) )
+			) {
+				$this->primeFileCache( [ $path ] ); // check persistent cache
+			}
 		}
-		if ( $this->cheapCache->hasField( $path, 'stat', self::CACHE_TTL ) ) {
-			$stat = $this->cheapCache->getField( $path, 'stat' );
-			// If we want the latest data, check that this cached
-			// value was in fact fetched with the latest available data.
-			if ( is_array( $stat ) ) {
-				if ( !$latest || $stat['latest'] ) {
-					return $stat;
-				}
-			} elseif ( in_array( $stat, [ 'NOT_EXIST', 'NOT_EXIST_LATEST' ] ) ) {
-				if ( !$latest || $stat === 'NOT_EXIST_LATEST' ) {
-					return false;
-				}
+
+		$stat = $this->cheapCache->getField( $path, 'stat', self::CACHE_TTL );
+		// If we want the latest data, check that this cached
+		// value was in fact fetched with the latest available data.
+		if ( is_array( $stat ) ) {
+			if (
+				( !$latest || $stat['latest'] ) &&
+				( !$requireSHA1 || isset( $stat['sha1'] ) )
+			) {
+				return $stat;
+			}
+		} elseif ( in_array( $stat, [ 'NOT_EXIST', 'NOT_EXIST_LATEST' ], true ) ) {
+			if ( !$latest || $stat === 'NOT_EXIST_LATEST' ) {
+				return false;
 			}
 		}
+
 		$stat = $this->doGetFileStat( $params );
+
 		if ( is_array( $stat ) ) { // file exists
 			// Strongly consistent backends can automatically set "latest"
 			$stat['latest'] = $stat['latest'] ?? $latest;
@@ -993,7 +1009,7 @@ abstract class FileBackendStore extends FileBackend {
 	 * @param string $container Resolved container name
 	 * @param string $dir Resolved path relative to container
 	 * @param array $params
-	 * @return Traversable|array|null Returns null on failure
+	 * @return Traversable|string[]|null Returns null on failure
 	 */
 	abstract public function getFileListInternal( $container, $dir, array $params );