Merge "Fix 'logName' parameter (5th) in many uses of mw.log.deprecate"

[lhc/web/wiklou.git] / includes / libs / filebackend / fileop / FileOp.php

diff --git a/includes/libs/filebackend/fileop/FileOp.php b/includes/libs/filebackend/fileop/FileOp.php
index fab5a37..40af7ac 100644 (file)
--- a/includes/libs/filebackend/fileop/FileOp.php
+++ b/includes/libs/filebackend/fileop/FileOp.php
@@ -19,7 +19,6 @@
  *
  * @file
  * @ingroup FileBackend
- * @author Aaron Schulz
  */
 use Psr\Log\LoggerInterface;
 
@@ -248,7 +247,7 @@ abstract class FileOp {
         * This must update $predicates for each path that the op can change
         * except when a failing StatusValue object is returned.
         *
-        * @param array $predicates
+        * @param array &$predicates
         * @return StatusValue
         */
        final public function precheck( array &$predicates ) {
@@ -265,7 +264,7 @@ abstract class FileOp {
        }
 
        /**
-        * @param array $predicates
+        * @param array &$predicates
         * @return StatusValue
         */
        protected function doPrecheck( array &$predicates ) {
@@ -461,7 +460,7 @@ abstract class FileOp {
                $params = $this->params;
                $params['failedAction'] = $action;
                try {
-                       $this->logger->error( get_class( $this ) .
+                       $this->logger->error( static::class .
                                " failed (batch #{$this->batchId}): " . FormatJson::encode( $params ) );
                } catch ( Exception $e ) {
                        // bad config? debug log error?