From e8eb1c976c2b0de3e8e6de395a3e38dd70b5fb17 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Fri, 21 Aug 2009 18:04:45 +0000
Subject: [PATCH] Interface OutputStreamer has no longer assignVariable()

---
 .../io/output/class_OutputStreamer.php        |  9 -------
 .../main/debug/class_DebugConsoleOutput.php   | 12 ---------
 .../main/debug/class_DebugErrorLogOutput.php  | 12 ---------
 .../main/debug/class_DebugWebOutput.php       | 12 ---------
 .../main/output/class_ConsoleOutput.php       | 26 +------------------
 5 files changed, 1 insertion(+), 70 deletions(-)

diff --git a/inc/classes/interfaces/io/output/class_OutputStreamer.php b/inc/classes/interfaces/io/output/class_OutputStreamer.php
index a6a2109e..7fd9c0eb 100644
--- a/inc/classes/interfaces/io/output/class_OutputStreamer.php
+++ b/inc/classes/interfaces/io/output/class_OutputStreamer.php
@@ -22,15 +22,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 interface OutputStreamer extends Streamable {
-	/**
-	 * Assigns a variable for output
-	 *
-	 * @param	$var	The variable we shall assign
-	 * @param	$value	The value to store in the variable
-	 * @return	void
-	 */
-	function assignVariable ($var, $value);
-
 	/**
 	 * Output the code
 	 *
diff --git a/inc/classes/main/debug/class_DebugConsoleOutput.php b/inc/classes/main/debug/class_DebugConsoleOutput.php
index f5588458..6bf372f8 100644
--- a/inc/classes/main/debug/class_DebugConsoleOutput.php
+++ b/inc/classes/main/debug/class_DebugConsoleOutput.php
@@ -59,18 +59,6 @@ class DebugConsoleOutput extends BaseFrameworkSystem implements Debugger, Output
 		printf("%s\n", $output);
 	}
 
-	/**
-	 * Assigns a variable for output
-	 *
-	 * @param	$var	The variable we shall assign
-	 * @param	$value	The value to store in the variable
-	 * @return	void
-	 */
-	public final function assignVariable ($var, $value) {
-		// Empty stub!
-		trigger_error(__METHOD__.": Stub!");
-	}
-
 	/**
 	 * Output the code
 	 *
diff --git a/inc/classes/main/debug/class_DebugErrorLogOutput.php b/inc/classes/main/debug/class_DebugErrorLogOutput.php
index fcc7f659..b9a71892 100644
--- a/inc/classes/main/debug/class_DebugErrorLogOutput.php
+++ b/inc/classes/main/debug/class_DebugErrorLogOutput.php
@@ -64,18 +64,6 @@ class DebugErrorLogOutput extends BaseFrameworkSystem implements Debugger, Outpu
 		}
 	}
 
-	/**
-	 * Assigns a variable for output
-	 *
-	 * @param	$var	The variable we shall assign
-	 * @param	$value	The value to store in the variable
-	 * @return	void
-	 */
-	public final function assignVariable ($var, $value) {
-		// Empty stub!
-		trigger_error(__METHOD__.": Stub!");
-	}
-
 	/**
 	 * Output the code
 	 *
diff --git a/inc/classes/main/debug/class_DebugWebOutput.php b/inc/classes/main/debug/class_DebugWebOutput.php
index e01ba0b9..3ff18e99 100644
--- a/inc/classes/main/debug/class_DebugWebOutput.php
+++ b/inc/classes/main/debug/class_DebugWebOutput.php
@@ -57,18 +57,6 @@ class DebugWebOutput extends BaseFrameworkSystem implements Debugger, OutputStre
 		print(stripslashes($output)."<br />\n");
 	}
 
-	/**
-	 * Assigns a variable for output
-	 *
-	 * @param	$var	The variable we shall assign
-	 * @param	$value	The value to store in the variable
-	 * @return	void
-	 */
-	public final function assignVariable ($var, $value) {
-		// Empty stub!
-		trigger_error(__METHOD__.": Stub!");
-	}
-
 	/**
 	 * Output the code
 	 *
diff --git a/inc/classes/main/output/class_ConsoleOutput.php b/inc/classes/main/output/class_ConsoleOutput.php
index 599ec7f9..e8b6cdce 100644
--- a/inc/classes/main/output/class_ConsoleOutput.php
+++ b/inc/classes/main/output/class_ConsoleOutput.php
@@ -28,11 +28,6 @@ class ConsoleOutput extends BaseFrameworkSystem implements OutputStreamer {
 	 */
 	private static $consoleInstance = null;
 
-	/**
-	 * Assigned variables
-	 */
-	private $vars = array();
-
 	/**
 	 * Protected constructor
 	 *
@@ -89,26 +84,7 @@ class ConsoleOutput extends BaseFrameworkSystem implements OutputStreamer {
 	 * @return	void
 	 */
 	public final function output ($outStream = false) {
-		if ($outStream === false) {
-			// Output something here...
-			foreach ($this->vars as $var => $value) {
-				$this->output("var=".$var.", value=".$value.'');
-			}
-		} else {
-			// Output it to the console
-			printf("%s\n", trim(html_entity_decode(strip_tags(stripslashes($outStream)))));
-		}
-	}
-
-	/**
-	 * Assigns a variable for output
-	 *
-	 * @param	$var	The variable we shall assign
-	 * @param	$value	The value to store in the variable
-	 * @return	void
-	 */
-	public function assignVariable ($var, $value) {
-		$this->vars[$var] = $value;
+		print trim($outStream) . "\n";
 	}
 }
 
-- 
2.39.5