From c8dd8f02eb618d6c0ca4a22316ca3bbd830e15a1 Mon Sep 17 00:00:00 2001
From: Shoghi Cervantes <shoghicp@gmail.com>
Date: Wed, 2 Jul 2014 23:11:39 +0200
Subject: [PATCH] Finished #1555 todo list

---
 src/spl/AttachableLogger.php         | 40 ++++++++++++++++
 src/spl/AttachableThreadedLogger.php | 70 ++++++++++++++++++++++++++++
 src/spl/LoggerAttachment.php         | 34 ++++++++++++++
 src/spl/ThreadedLogger.php           | 46 ------------------
 src/spl/ThreadedLoggerAttachment.php |  7 +--
 5 files changed, 145 insertions(+), 52 deletions(-)
 create mode 100644 src/spl/AttachableLogger.php
 create mode 100644 src/spl/AttachableThreadedLogger.php
 create mode 100644 src/spl/LoggerAttachment.php

diff --git a/src/spl/AttachableLogger.php b/src/spl/AttachableLogger.php
new file mode 100644
index 0000000000..dfe76830f5
--- /dev/null
+++ b/src/spl/AttachableLogger.php
@@ -0,0 +1,40 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+interface AttachableLogger extends \Logger{
+
+	/**
+	 * @param LoggerAttachment $attachment
+	 */
+	public function addAttachment(\LoggerAttachment $attachment);
+
+	/**
+	 * @param LoggerAttachment $attachment
+	 */
+	public function removeAttachment(\LoggerAttachment $attachment);
+
+	public function removeAttachments();
+
+	/**
+	 * @return \LoggerAttachment[]
+	 */
+	public function getAttachments();
+}
\ No newline at end of file
diff --git a/src/spl/AttachableThreadedLogger.php b/src/spl/AttachableThreadedLogger.php
new file mode 100644
index 0000000000..df61dda76b
--- /dev/null
+++ b/src/spl/AttachableThreadedLogger.php
@@ -0,0 +1,70 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+abstract class AttachableThreadedLogger extends \ThreadedLogger{
+
+	/** @var \ThreadedLoggerAttachment */
+	protected $attachment = null;
+
+	/**
+	 * @param ThreadedLoggerAttachment $attachment
+	 */
+	public function addAttachment(\ThreadedLoggerAttachment $attachment){
+		if($this->attachment instanceof \ThreadedLoggerAttachment){
+			$this->attachment->addAttachment($attachment);
+		}else{
+			$this->attachment = $attachment;
+		}
+	}
+
+	/**
+	 * @param ThreadedLoggerAttachment $attachment
+	 */
+	public function removeAttachment(\ThreadedLoggerAttachment $attachment){
+		if($this->attachment instanceof \ThreadedLoggerAttachment){
+			if($this->attachment === $attachment){
+				$this->attachment = null;
+				foreach($attachment->getAttachments() as $attachment){
+					$this->addAttachment($attachment);
+				}
+			}
+		}
+	}
+
+	public function removeAttachments(){
+		if($this->attachment instanceof \ThreadedLoggerAttachment){
+			$this->attachment->removeAttachments();
+			$this->attachment = null;
+		}
+	}
+
+	/**
+	 * @return \ThreadedLoggerAttachment[]
+	 */
+	public function getAttachments(){
+		$attachments = [];
+		if($this->attachment instanceof \ThreadedLoggerAttachment){
+			$attachments[] = $this->attachment;
+			$attachments += $this->attachment->getAttachments();
+		}
+		return $attachments;
+	}
+}
\ No newline at end of file
diff --git a/src/spl/LoggerAttachment.php b/src/spl/LoggerAttachment.php
new file mode 100644
index 0000000000..9128087540
--- /dev/null
+++ b/src/spl/LoggerAttachment.php
@@ -0,0 +1,34 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+interface LoggerAttachment{
+
+	/**
+	 * @param string $message
+	 */
+	public function log($message);
+
+	/**
+	 * @param string $message
+	 */
+	public function call($message);
+
+}
\ No newline at end of file
diff --git a/src/spl/ThreadedLogger.php b/src/spl/ThreadedLogger.php
index 8b345980e8..62c3b6cb0e 100644
--- a/src/spl/ThreadedLogger.php
+++ b/src/spl/ThreadedLogger.php
@@ -21,50 +21,4 @@
 
 abstract class ThreadedLogger extends \Thread implements Logger{
 
-	/** @var \ThreadedLoggerAttachment */
-	protected $attachment = null;
-
-	/**
-	 * @param ThreadedLoggerAttachment $attachment
-	 */
-	public function addAttachment(\ThreadedLoggerAttachment $attachment){
-		if($this->attachment instanceof \ThreadedLoggerAttachment){
-			$this->attachment->addAttachment($attachment);
-		}else{
-			$this->attachment = $attachment;
-		}
-	}
-
-	/**
-	 * @param ThreadedLoggerAttachment $attachment
-	 */
-	public function removeAttachment(\ThreadedLoggerAttachment $attachment){
-		if($this->attachment instanceof \ThreadedLoggerAttachment){
-			if($this->attachment === $attachment){
-				$this->attachment = null;
-				foreach($attachment->getAttachments() as $attachment){
-					$this->addAttachment($attachment);
-				}
-			}
-		}
-	}
-
-	public function removeAttachments(){
-		if($this->attachment instanceof \ThreadedLoggerAttachment){
-			$this->attachment->removeAttachments();
-			$this->attachment = null;
-		}
-	}
-
-	/**
-	 * @return \ThreadedLoggerAttachment[]
-	 */
-	public function getAttachments(){
-		$attachments = [];
-		if($this->attachment instanceof \ThreadedLoggerAttachment){
-			$attachments[] = $this->attachment;
-			$attachments += $this->attachment->getAttachments();
-		}
-		return $attachments;
-	}
 }
\ No newline at end of file
diff --git a/src/spl/ThreadedLoggerAttachment.php b/src/spl/ThreadedLoggerAttachment.php
index a5f21f7135..f66df2b7f4 100644
--- a/src/spl/ThreadedLoggerAttachment.php
+++ b/src/spl/ThreadedLoggerAttachment.php
@@ -19,16 +19,11 @@
  *
 */
 
-abstract class ThreadedLoggerAttachment extends \Threaded{
+abstract class ThreadedLoggerAttachment extends \Threaded implements \LoggerAttachment{
 
 	/** @var \ThreadedLoggerAttachment */
 	protected $attachment = null;
 
-	/**
-	 * @param string $message
-	 */
-	protected abstract function log($message);
-
 	/**
 	 * @param string $message
 	 */