-
Couldn't load subscription status.
- Fork 2
Okonomiyaki3000: _log returns the class instance for method chaining #43 #4
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
fe5b422
_log returns the class instance for method chaining
okonomiyaki3000 de8a354
Hmm. No reason to get the instance again when we already have it, eh?
okonomiyaki3000 8bc18b4
Update the docblock return value, always return , use empty instead o…
okonomiyaki3000 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -244,33 +244,31 @@ 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'])) { | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This change is about two styles for presenting check two values will be set. If we accept this, we should change all related conditions to this in this respo. |
||
| $backtrace_message = $backtrace[$level]['file'] . ' : ' . $backtrace[$level]['line']; | ||
| } | ||
|
|
||
| $logger->_addRow($logs, $backtrace_message, $type); | ||
|
|
||
| return $logger; | ||
| } | ||
|
|
||
| /** | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think the array syntax should be short syntax because of consistency. Using the
[....]instead.And this short syntax is supported sine the
php-5.4+.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done in PR #6.