From 60224bb0f87123db9d5f0bb4ea8755e37f9b8f45 Mon Sep 17 00:00:00 2001 From: Elijah Madden Date: Tue, 1 Apr 2014 11:22:50 +0900 Subject: [PATCH 1/3] _log returns the class instance for method chaining --- ChromePhp.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ChromePhp.php b/ChromePhp.php index 577b1ce..5d0a821 100755 --- a/ChromePhp.php +++ b/ChromePhp.php @@ -272,6 +272,8 @@ protected static function _log($type, array $args) } $logger->_addRow($logs, $backtrace_message, $type); + + return self::getInstance(); } /** From 85f83f6a74a077d494c40b684c912afd0c0eee90 Mon Sep 17 00:00:00 2001 From: Elijah Madden Date: Tue, 1 Apr 2014 11:55:32 +0900 Subject: [PATCH 2/3] Hmm. No reason to get the instance again when we already have it, eh? --- ChromePhp.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChromePhp.php b/ChromePhp.php index 5d0a821..32b715f 100755 --- a/ChromePhp.php +++ b/ChromePhp.php @@ -273,7 +273,7 @@ protected static function _log($type, array $args) $logger->_addRow($logs, $backtrace_message, $type); - return self::getInstance(); + return $logger; } /** From 0b3af50b8ded93fb4fb16e06d56191182bd8bc71 Mon Sep 17 00:00:00 2001 From: Elijah Madden Date: Tue, 1 Apr 2014 15:49:11 +0900 Subject: [PATCH 3/3] Update the docblock return value, always return , use empty instead of count, use array_map instead of foreach, call isset with multiple args --- ChromePhp.php | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/ChromePhp.php b/ChromePhp.php index 32b715f..f8f3952 100755 --- a/ChromePhp.php +++ b/ChromePhp.php @@ -245,29 +245,25 @@ public static function table() * internal logging call * * @param string $type - * @return void + * @return ChromePhp */ protected static function _log($type, array $args) { + $logger = self::getInstance(); + // nothing passed in, don't do anything - if (count($args) == 0 && $type != self::GROUP_END) { - return; + if (empty($args) && $type != self::GROUP_END) { + return $logger; } - $logger = self::getInstance(); - $logger->_processed = array(); - - $logs = array(); - foreach ($args as $arg) { - $logs[] = $logger->_convert($arg); - } + $logs = array_map(array($logger, '_convert'), $args); $backtrace = debug_backtrace(false); $level = $logger->getSetting(self::BACKTRACE_LEVEL); $backtrace_message = 'unknown'; - if (isset($backtrace[$level]['file']) && isset($backtrace[$level]['line'])) { + if (isset($backtrace[$level]['file'], $backtrace[$level]['line'])) { $backtrace_message = $backtrace[$level]['file'] . ' : ' . $backtrace[$level]['line']; }