From a60b03baa98f8094fb1738e48e4ca8ca4f2b9026 Mon Sep 17 00:00:00 2001
From: Mike Jolley <mike.jolley@me.com>
Date: Tue, 19 Apr 2016 16:56:41 +0100
Subject: [PATCH] Log close method. Fixes unit tests.

---
 includes/class-wc-logger.php | 32 +++++++++++++++++++++++---------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/includes/class-wc-logger.php b/includes/class-wc-logger.php
index d9a8eb8f831..7a6c19c05b5 100644
--- a/includes/class-wc-logger.php
+++ b/includes/class-wc-logger.php
@@ -35,21 +35,20 @@ class WC_Logger {
 	 */
 	public function __destruct() {
 		foreach ( $this->_handles as $handle ) {
-			@fclose( $handle );
+			if ( is_resource( $handle ) ) {
+				fclose( $handle );
+			}
 		}
 	}
 
 	/**
 	 * Open log file for writing.
 	 *
-	 * @access private
-	 *
 	 * @param string $handle
 	 * @param string $mode
-	 *
 	 * @return bool success
 	 */
-	private function open( $handle, $mode = 'a' ) {
+	protected function open( $handle, $mode = 'a' ) {
 		if ( isset( $this->_handles[ $handle ] ) ) {
 			return true;
 		}
@@ -61,6 +60,23 @@ class WC_Logger {
 		return false;
 	}
 
+	/**
+	 * Close a handle.
+	 *
+	 * @param string $handle
+	 * @return bool success
+	 */
+	protected function close( $handle ) {
+		$result = false;
+
+		if ( is_resource( $this->_handles[ $handle ] ) ) {
+			$result = fclose( $this->_handles[ $handle ] );
+			unset( $this->_handles[ $handle ] );
+		}
+
+		return $result;
+	}
+
 	/**
 	 * Add a log entry to chosen file.
 	 *
@@ -74,7 +90,7 @@ class WC_Logger {
 
 		if ( $this->open( $handle ) && is_resource( $this->_handles[ $handle ] ) ) {
 			$time   = date_i18n( 'm-d-Y @ H:i:s -' ); // Grab Time
-			$result = @fwrite( $this->_handles[ $handle ], $time . " " . $message . "\n" );
+			$result = fwrite( $this->_handles[ $handle ], $time . " " . $message . "\n" );
 		}
 
 		do_action( 'woocommerce_log_add', $handle, $message );
@@ -93,9 +109,7 @@ class WC_Logger {
 		$result = false;
 
 		// Close the file if it's already open.
-		if ( is_resource( $this->_handles[ $handle ] ) ) {
-			@fclose( $handle );
-		}
+		$this->close( $handle );
 
 		/**
 		 * $this->open( $handle, 'w' ) == Open the file for writing only. Place the file pointer at the beginning of the file,