From c796715911e2a8bd366dd8104fea1f967a6f9684 Mon Sep 17 00:00:00 2001
From: Aaron Schulz <aschulz@wikimedia.org>
Date: Sun, 18 Sep 2016 16:07:34 -0700
Subject: [PATCH] Remove wfDebugLog() dependency from FileOp classes

Change-Id: Ib8ab9edd1afdb28f7444f5e13cf34a696a066234
---
 includes/filebackend/FileBackendStore.php |  2 +-
 includes/filebackend/FileOp.php           | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/includes/filebackend/FileBackendStore.php b/includes/filebackend/FileBackendStore.php
index 3fd1ce6f5b..66f0737e22 100644
--- a/includes/filebackend/FileBackendStore.php
+++ b/includes/filebackend/FileBackendStore.php
@@ -1020,7 +1020,7 @@ abstract class FileBackendStore extends FileBackend {
 				// Get params for this operation
 				$params = $operation;
 				// Append the FileOp class
-				$performOps[] = new $class( $this, $params );
+				$performOps[] = new $class( $this, $params, $this->logger );
 			} else {
 				throw new FileBackendError( "Operation '$opName' is not supported." );
 			}
diff --git a/includes/filebackend/FileOp.php b/includes/filebackend/FileOp.php
index 480ebdf051..8207b124b2 100644
--- a/includes/filebackend/FileOp.php
+++ b/includes/filebackend/FileOp.php
@@ -21,6 +21,7 @@
  * @ingroup FileBackend
  * @author Aaron Schulz
  */
+use Psr\Log\LoggerInterface;
 
 /**
  * FileBackend helper class for representing operations.
@@ -39,6 +40,8 @@ abstract class FileOp {
 
 	/** @var FileBackendStore */
 	protected $backend;
+	/** @var LoggerInterface */
+	protected $logger;
 
 	/** @var int */
 	protected $state = self::STATE_NEW;
@@ -74,10 +77,14 @@ abstract class FileOp {
 	 *
 	 * @param FileBackendStore $backend
 	 * @param array $params
+	 * @param LoggerInterface $logger PSR logger instance
 	 * @throws FileBackendError
 	 */
-	final public function __construct( FileBackendStore $backend, array $params ) {
+	final public function __construct(
+		FileBackendStore $backend, array $params, LoggerInterface $logger
+	) {
 		$this->backend = $backend;
+		$this->logger = $logger;
 		list( $required, $optional, $paths ) = $this->allowedParams();
 		foreach ( $required as $name ) {
 			if ( isset( $params[$name] ) ) {
@@ -454,7 +461,7 @@ abstract class FileOp {
 		$params = $this->params;
 		$params['failedAction'] = $action;
 		try {
-			wfDebugLog( 'FileOperation', get_class( $this ) .
+			$this->logger->error( get_class( $this ) .
 				" failed (batch #{$this->batchId}): " . FormatJson::encode( $params ) );
 		} catch ( Exception $e ) {
 			// bad config? debug log error?
-- 
2.20.1