Parse Carbon objects #235
Merged
Parse Carbon objects #235
Conversation
This file contains 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
Propaganistas
commented
Feb 4, 2017
| if (! $time instanceof self) { | ||
| $time = new static($time, $timezone); | ||
| if (! $time instanceof static) { | ||
| $time = Date::parse($time, $timezone); |
There was a problem hiding this comment.
Allows Carbon objects to be passed to timespan().
Propaganistas
commented
Feb 4, 2017
| @@ -274,8 +283,8 @@ public function timespan($time = null, $timezone = null) | |||
| $lang = $this->getTranslator(); | |||
|
|
|||
| // Create Date instance if needed | |||
| if (! $time instanceof self) { | |||
There was a problem hiding this comment.
self seemed inappropriate to me
Propaganistas
commented
Feb 4, 2017
| ); | ||
| } | ||
|
|
||
| if (! is_int($time)) { |
There was a problem hiding this comment.
If $time is an integer, it's a Unix timestamp. By not sending it through translateTimeString(), it remains an integer and is then correctly handled in the constructor.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Allows for rapid conversion of plain Carbon objects.
L85 also allows Unix timestamps to be passed to
parse().