dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Add support for PHP7 random_bytes in favor of mcrypt_create_iv"
[lhc/web/wiklou.git]
/
includes
/
libs
/
filebackend
/
FileBackendStore.php
diff --git
a/includes/libs/filebackend/FileBackendStore.php
b/includes/libs/filebackend/FileBackendStore.php
index
a7ceab2
..
7cb26c6
100644
(file)
--- a/
includes/libs/filebackend/FileBackendStore.php
+++ b/
includes/libs/filebackend/FileBackendStore.php
@@
-21,6
+21,7
@@
* @ingroup FileBackend
* @author Aaron Schulz
*/
* @ingroup FileBackend
* @author Aaron Schulz
*/
+use Wikimedia\Timestamp\ConvertibleTimestamp;
/**
* @brief Base class for all backends using particular storage medium.
/**
* @brief Base class for all backends using particular storage medium.
@@
-359,7
+360,7
@@
abstract class FileBackendStore extends FileBackend {
$status->merge( $this->doConcatenate( $params ) );
$sec = microtime( true ) - $start_time;
if ( !$status->isOK() ) {
$status->merge( $this->doConcatenate( $params ) );
$sec = microtime( true ) - $start_time;
if ( !$status->isOK() ) {
- $this->logger->error(
get_class( $this )
. "-{$this->name}" .
+ $this->logger->error(
static::class
. "-{$this->name}" .
" failed to concatenate " . count( $params['srcs'] ) . " file(s) [$sec sec]" );
}
}
" failed to concatenate " . count( $params['srcs'] ) . " file(s) [$sec sec]" );
}
}
@@
-1122,7
+1123,7
@@
abstract class FileBackendStore extends FileBackend {
$subStatus->success[$i] = false;
++$subStatus->failCount;
}
$subStatus->success[$i] = false;
++$subStatus->failCount;
}
- $this->logger->error(
get_class( $this )
. "-{$this->name} " .
+ $this->logger->error(
static::class
. "-{$this->name} " .
" stat failure; aborted operations: " . FormatJson::encode( $ops ) );
}
" stat failure; aborted operations: " . FormatJson::encode( $ops ) );
}