* @return string|bool Decompressed text, or false on failure
*/
public static function decompressRevisionText( $text, $flags ) {
+ if ( $text === false ) {
+ // Text failed to be fetched; nothing to do
+ return false;
+ }
+
return self::getBlobStore()->decompressData( $text, $flags );
}
// No negative caching per BlobStore::getBlob()
$blob = ExternalStore::fetchFromURL( $url, [ 'wiki' => $this->wikiId ] );
- return $this->decompressData( $blob, $flags );
+ return $blob === false ? false : $this->decompressData( $blob, $flags );
},
[ 'pcGroup' => self::TEXT_CACHE_GROUP, 'pcTTL' => WANObjectCache::TTL_PROC_LONG ]
);
} else {
$blob = ExternalStore::fetchFromURL( $url, [ 'wiki' => $this->wikiId ] );
- return $this->decompressData( $blob, $flags );
+ return $blob === false ? false : $this->decompressData( $blob, $flags );
}
} else {
return $this->decompressData( $raw, $flags );
* @note direct use is deprecated, use getBlob() or SlotRecord::getContent() instead.
* @todo make this private, there should be no need to use this method outside this class.
*
- * @param mixed $blob Reference to a text
+ * @param string $blob Blob in compressed/encoded form.
* @param array $blobFlags Compression flags, such as 'gzip'.
* Note that not including 'utf-8' in $blobFlags will cause the data to be decoded
* according to the legacy encoding specified via setLegacyEncoding.
* @return string|bool Decompressed text, or false on failure
*/
public function decompressData( $blob, array $blobFlags ) {
- if ( $blob === false ) {
- // Text failed to be fetched; nothing to do
- return false;
- }
+ // Revision::decompressRevisionText accepted false here, so defend against that
+ Assert::parameterType( 'string', $blob, '$blob' );
if ( in_array( 'error', $blobFlags ) ) {
// Error row, return false
}
public function provideDecompress() {
- yield '(no legacy encoding), false in false out' => [ false, false, [], false ];
yield '(no legacy encoding), empty in empty out' => [ false, '', [], '' ];
yield '(no legacy encoding), empty in empty out' => [ false, 'A', [], 'A' ];
+ yield '(no legacy encoding), error flag -> false' => [ false, 'X', [ 'error' ], false ];
yield '(no legacy encoding), string in with gzip flag returns string' => [
// gzip string below generated with gzdeflate( 'AAAABBAAA' )
false, "sttttr\002\022\000", [ 'gzip' ], 'AAAABBAAA',
);
}
+ /**
+ * @covers \MediaWiki\Storage\SqlBlobStore::decompressData
+ */
+ public function testDecompressData_InvalidArgumentException() {
+ $store = $this->getBlobStore();
+
+ $this->setExpectedException( InvalidArgumentException::class );
+ $store->decompressData( false, [] );
+ }
+
/**
* @covers \MediaWiki\Storage\SqlBlobStore::compressData
*/