PHPC-536: UTCDateTime construction from DateTime or current time #336
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
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
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 |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| --TEST-- | ||
| BSON BSON\UTCDateTime constructor defaults to current time | ||
| --SKIPIF-- | ||
| <?php require __DIR__ . "/../utils/basic-skipif.inc"?> | ||
| --FILE-- | ||
| <?php | ||
| require_once __DIR__ . "/../utils/basic.inc"; | ||
|
|
||
| $tests = [ | ||
| new MongoDB\BSON\UTCDateTime, | ||
| new MongoDB\BSON\UTCDateTime(null), | ||
|
There was a problem hiding this comment. I think "null" should just be coerced to There was a problem hiding this comment. The current behavior is consistent with your HHVM implementation. Note that DateTime's constructor also defaults to the current time if |
||
| ]; | ||
|
|
||
| foreach ($tests as $test) { | ||
| var_dump($test); | ||
| } | ||
|
|
||
| ?> | ||
| ===DONE=== | ||
| <?php exit(0); ?> | ||
| --EXPECTF-- | ||
| object(%SBSON\UTCDateTime)#%d (%d) { | ||
| ["milliseconds"]=> | ||
| int(%d) | ||
| } | ||
| object(%SBSON\UTCDateTime)#%d (%d) { | ||
| ["milliseconds"]=> | ||
| int(%d) | ||
| } | ||
| ===DONE=== | ||
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 |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| --TEST-- | ||
| BSON BSON\UTCDateTime construction from DateTime | ||
| --SKIPIF-- | ||
| <?php require __DIR__ . "/../utils/basic-skipif.inc"?> | ||
| --FILE-- | ||
| <?php | ||
| require_once __DIR__ . "/../utils/basic.inc"; | ||
|
|
||
| $tests = [ | ||
| new DateTime(), | ||
| new DateTime('@1215282385'), | ||
| new DateTime('2011-01-01T15:03:01.012345Z'), | ||
| new DateTime('2050-11-12T13:14:15.999999Z'), | ||
| ]; | ||
|
|
||
| foreach ($tests as $test) { | ||
| var_dump(new MongoDB\BSON\UTCDateTime($test)); | ||
|
There was a problem hiding this comment. I think you should try to round trip them back with There was a problem hiding this comment. Sounds like a good idea. Let's get #338 merged first in that case, since it fixes |
||
| } | ||
|
|
||
| ?> | ||
| ===DONE=== | ||
| <?php exit(0); ?> | ||
| --EXPECTF-- | ||
| object(%SBSON\UTCDateTime)#%d (%d) { | ||
| ["milliseconds"]=> | ||
| int(%d000) | ||
| } | ||
| object(%SBSON\UTCDateTime)#%d (%d) { | ||
| ["milliseconds"]=> | ||
| int(1215282385000) | ||
| } | ||
| object(%SBSON\UTCDateTime)#%d (%d) { | ||
| ["milliseconds"]=> | ||
| int(1293894181012) | ||
| } | ||
| object(%SBSON\UTCDateTime)#%d (%d) { | ||
| ["milliseconds"]=> | ||
| int(2551871655999) | ||
| } | ||
| ===DONE=== | ||
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 |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| --TEST-- | ||
| BSON BSON\UTCDateTime construction from DateTimeImmutable | ||
| --SKIPIF-- | ||
| <?php if (!version_compare(phpversion(), "5.5", '>=')) echo "skip >= PHP 5.5 needed\n"; ?> | ||
| <?php require __DIR__ . "/../utils/basic-skipif.inc"?> | ||
| --FILE-- | ||
| <?php | ||
| require_once __DIR__ . "/../utils/basic.inc"; | ||
|
|
||
| $tests = [ | ||
| new DateTimeImmutable(), | ||
| new DateTimeImmutable('@1215282385'), | ||
| new DateTimeImmutable('2011-01-01T15:03:01.012345Z'), | ||
| new DateTimeImmutable('2050-11-12T13:14:15.999999Z'), | ||
| ]; | ||
|
|
||
| foreach ($tests as $test) { | ||
| var_dump(new MongoDB\BSON\UTCDateTime($test)); | ||
| } | ||
|
|
||
| ?> | ||
| ===DONE=== | ||
| <?php exit(0); ?> | ||
| --EXPECTF-- | ||
| object(%SBSON\UTCDateTime)#%d (%d) { | ||
| ["milliseconds"]=> | ||
| int(%d000) | ||
| } | ||
| object(%SBSON\UTCDateTime)#%d (%d) { | ||
| ["milliseconds"]=> | ||
| int(1215282385000) | ||
| } | ||
| object(%SBSON\UTCDateTime)#%d (%d) { | ||
| ["milliseconds"]=> | ||
| int(1293894181012) | ||
| } | ||
| object(%SBSON\UTCDateTime)#%d (%d) { | ||
| ["milliseconds"]=> | ||
| int(2551871655999) | ||
| } | ||
| ===DONE=== |
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 |
|---|---|---|
| @@ -1,22 +1,19 @@ | ||
| --TEST-- | ||
| BSON BSON\UTCDateTime requires object argument to implement DateTimeInterface | ||
| --SKIPIF-- | ||
| <?php require __DIR__ . "/../utils/basic-skipif.inc"?> | ||
| --FILE-- | ||
| <?php | ||
|
There was a problem hiding this comment. We might have to put this one back in I suppose, if we find that it's still different with HHVM. There was a problem hiding this comment. I don't think it will be a problem. Your constructor accepts a mixed type and all validation is left to you, so it should be trivial to customize the exception message here. |
||
| require_once __DIR__ . "/../utils/basic.inc"; | ||
|
|
||
| echo throws(function() { | ||
| new MongoDB\BSON\UTCDateTime(new stdClass); | ||
| }, 'MongoDB\Driver\Exception\InvalidArgumentException'), "\n"; | ||
|
|
||
| ?> | ||
| ===DONE=== | ||
| <?php exit(0); ?> | ||
| --EXPECT-- | ||
| OK: Got MongoDB\Driver\Exception\InvalidArgumentException | ||
| Expected instance of DateTimeInterface, stdClass given | ||
| ===DONE=== | ||
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 if you now pass it in as a non datetime class, it will not throw an error/exception.
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.
We still end up with an InvalidArgumentException:
In the HHVM driver, you end up casting the argument to an integer if it's neither
nullnor a DateTime instance. Would you like to intercept other objects and throw a special message?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.
Yes.
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 went with "Expected instance of DateTimeInterface, $classname given". We technically check for an instance of DateTime and DateTimeImmutable (on 5.5+); however, DateTimeInterface cannot be implemented by userland classes so the message is still accurate.