reordering the functions

Author: dmolsen

src/PatternLab/Console.php

@@ -408,53 +408,67 @@ public static function writeHelpCommand($command = "") {
 	}
 
 	/**
-	* Write out a line to the console
-	* @param  {String}        the content to be written out
-	* @param  {Boolean}       if there should be two spaces added to the beginning of the line
-	* @param  {Boolean}       if there should be two breaks added to the end of the line
+	* Make sure the space is properly set between long command options and short command options
+	* @param  {Integer}       the longest length of the command's options
+	* @param  {Integer}       the character length of the given option
 	*/
-	public static function writeLine($line,$doubleSpace = false,$doubleBreak = false) {
-		$break = ($doubleBreak) ? PHP_EOL.PHP_EOL : PHP_EOL;
-		if (strpos($line,"<nophpeol>") !== false) {
-			$break = "";
-			$line  = str_replace("<nophpeol>","",$line);
+	public static function getSpacer($lengthLong,$itemLongLength) {
+		$i            = 0;
+		$spacer       = " ";
+		$spacerLength = $lengthLong - $itemLongLength;
+		while ($i < $spacerLength) {
+			$spacer .= " ";
+			$i++;
 		}
-		$space = ($doubleSpace) ? "  " : "";
-		$c     = self::$color;
-		print $space.$c($line)->colorize().$break;
+		return $spacer;
 	}
 
 	/**
-	* Write out a line to the console with info tags
+	* Modify a line to include the given tag by default
+	* @param  {String}        the content to be written out
+	*/
+	public static function addTags($line,$tag) {
+		$lineFinal = "<".$tag.">".preg_replace("/<[A-z0-9-_]{1,}>[^<]{1,}<\/[A-z0-9-_]{1,}>/","</".$tag.">$0<".$tag.">",$line)."</".$tag.">";
+		return $lineFinal;
+	}
+	
+	/**
+	* Write out a line to the console with error tags
 	* @param  {String}        the content to be written out
 	* @param  {Boolean}       if there should be two spaces added to the beginning of the line
 	* @param  {Boolean}       if there should be two breaks added to the end of the line
 	*/
-	public static function writeInfo($line,$doubleSpace = false,$doubleBreak = false) {
-		$lineFinal = self::addTags($line,"info");
+	public static function writeError($line,$doubleSpace = false,$doubleBreak = false) {
+		$lineFinal = self::addTags($line,"error");
 		self::writeLine($lineFinal,$doubleSpace,$doubleBreak);
 	}
 
 	/**
-	* Write out a line to the console with warning tags
+	* Write out a line to the console with info tags
 	* @param  {String}        the content to be written out
 	* @param  {Boolean}       if there should be two spaces added to the beginning of the line
 	* @param  {Boolean}       if there should be two breaks added to the end of the line
 	*/
-	public static function writeWarning($line,$doubleSpace = false,$doubleBreak = false) {
-		$lineFinal = self::addTags($line,"warning");
+	public static function writeInfo($line,$doubleSpace = false,$doubleBreak = false) {
+		$lineFinal = self::addTags($line,"info");
 		self::writeLine($lineFinal,$doubleSpace,$doubleBreak);
 	}
 
 	/**
-	* Write out a line to the console with error tags
+	* Write out a line to the console
 	* @param  {String}        the content to be written out
 	* @param  {Boolean}       if there should be two spaces added to the beginning of the line
 	* @param  {Boolean}       if there should be two breaks added to the end of the line
 	*/
-	public static function writeError($line,$doubleSpace = false,$doubleBreak = false) {
-		$lineFinal = self::addTags($line,"error");
-		self::writeLine($lineFinal,$doubleSpace,$doubleBreak);
+	public static function writeLine($line,$doubleSpace = false,$doubleBreak = false) {
+		$break = ($doubleBreak) ? PHP_EOL.PHP_EOL : PHP_EOL;
+		if (strpos($line,"<nophpeol>") !== false) {
+			$break = "";
+			$line  = str_replace("<nophpeol>","",$line);
+		}
+		$space = ($doubleSpace) ? "  " : "";
+		$c     = self::$color;
+		print $space.$c($line)->colorize().$break;
 	}
 
 	/**
@@ -469,30 +483,15 @@ public static function writeTag($tag,$line,$doubleSpace = false,$doubleBreak = f
 		self::writeLine($lineFinal,$doubleSpace,$doubleBreak);
 	}
 
-	
 	/**
-	* Modify a line to include the given tag by default
+	* Write out a line to the console with warning tags
 	* @param  {String}        the content to be written out
+	* @param  {Boolean}       if there should be two spaces added to the beginning of the line
+	* @param  {Boolean}       if there should be two breaks added to the end of the line
 	*/
-	public static function addTags($line,$tag) {
-		$lineFinal = "<".$tag.">".preg_replace("/<[A-z0-9-_]{1,}>[^<]{1,}<\/[A-z0-9-_]{1,}>/","</".$tag.">$0<".$tag.">",$line)."</".$tag.">";
-		return $lineFinal;
-	}
-	
-	/**
-	* Make sure the space is properly set between long command options and short command options
-	* @param  {Integer}       the longest length of the command's options
-	* @param  {Integer}       the character length of the given option
-	*/
-	public static function getSpacer($lengthLong,$itemLongLength) {
-		$i            = 0;
-		$spacer       = " ";
-		$spacerLength = $lengthLong - $itemLongLength;
-		while ($i < $spacerLength) {
-			$spacer .= " ";
-			$i++;
-		}
-		return $spacer;
+	public static function writeWarning($line,$doubleSpace = false,$doubleBreak = false) {
+		$lineFinal = self::addTags($line,"warning");
+		self::writeLine($lineFinal,$doubleSpace,$doubleBreak);
 	}
 
 }