From bd0543ccd67c8d0c7d126ec9ddc521796c96635c Mon Sep 17 00:00:00 2001
From: Sidsector9 <siddharth.thevaril@gmail.com>
Date: Fri, 13 Oct 2017 12:14:03 +0530
Subject: [PATCH] GH#36 Corrected argument sequence and updated documentation

---
 inc/class-command.php   | 39 +++++++++++++++++++++++++++++++--------
 inc/class-formatter.php |  2 +-
 2 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/inc/class-command.php b/inc/class-command.php
index 559f9be..9f2e316 100644
--- a/inc/class-command.php
+++ b/inc/class-command.php
@@ -72,7 +72,13 @@ class Command {
 	 * : Render output in a particular format.
 	 *
 	 * [--order=<order>]
-	 * : Ascending or Descending order. ASC|DESC.
+	 * : Ascending or Descending order.
+	 * ---
+	 * default: ASC
+	 * options:
+	 *   - ASC
+	 *   - DESC
+	 * ---
 	 *
 	 * [--orderby=<orderby>]
 	 * : Order by fields.
@@ -143,7 +149,7 @@ class Command {
 			$loggers = self::shine_spotlight( $loggers, $metrics );
 		}
 
-		$formatter->display_items( $order, $orderby, $loggers );
+		$formatter->display_items( $loggers, true, $order, $orderby );
 	}
 
 	/**
@@ -173,12 +179,17 @@ class Command {
 	 * : Render output in a particular format.
 	 *
 	 * [--order=<order>]
-	 * : Ascending or Descending order. ASC|DESC.
+	 * : Ascending or Descending order.
+	 * ---
+	 * default: ASC
+	 * options:
+	 *   - ASC
+	 *   - DESC
+	 * ---
 	 *
 	 * [--orderby=<orderby>]
 	 * : Order by fields.
 	 *
-	 * ---
 	 * default: table
 	 * options:
 	 *   - table
@@ -227,7 +238,7 @@ class Command {
 		if ( Utils\get_flag_value( $assoc_args, 'spotlight' ) ) {
 			$loggers = self::shine_spotlight( $loggers, $metrics );
 		}
-		$formatter->display_items( $order, $orderby, $loggers );
+		$formatter->display_items( $loggers, true, $order, $orderby );
 	}
 
 	/**
@@ -252,7 +263,13 @@ class Command {
 	 * : Render output in a particular format.
 	 *
 	 * [--order=<order>]
-	 * : Ascending or Descending order. ASC|DESC.
+	 * : Ascending or Descending order.
+	 * ---
+	 * default: ASC
+	 * options:
+	 *   - ASC
+	 *   - DESC
+	 * ---
 	 *
 	 * [--orderby=<orderby>]
 	 * : Order by fields.
@@ -301,7 +318,13 @@ class Command {
 	 * : Render output in a particular format.
 	 *
 	 * [--order=<order>]
-	 * : Ascending or Descending order. ASC|DESC.
+	 * : Ascending or Descending order.
+	 * ---
+	 * default: ASC
+	 * options:
+	 *   - ASC
+	 *   - DESC
+	 * ---
 	 *
 	 * [--orderby=<orderby>]
 	 * : Order by fields.
@@ -373,7 +396,7 @@ class Command {
 			'request_count',
 		) );
 		$formatter = new Formatter( $assoc_args, $fields );
-		$formatter->display_items( $order, $orderby, $loggers, false );
+		$formatter->display_items( $loggers, false, $order, $orderby );
 	}
 
 	/**
diff --git a/inc/class-formatter.php b/inc/class-formatter.php
index 2a45fa5..d817392 100644
--- a/inc/class-formatter.php
+++ b/inc/class-formatter.php
@@ -42,7 +42,7 @@ class Formatter {
 	 *
 	 * @param array $items
 	 */
-	public function display_items( $order, $orderby, $items, $include_total = true ) {
+	public function display_items( $items, $include_total = true, $order, $orderby ) {
 		if ( 'table' === $this->args['format'] && empty( $this->args['field'] ) ) {
 			$this->show_table( $order, $orderby, $items, $this->args['fields'], $include_total );
 		} else {