Skip to content

Conversation

@jmikola
Copy link
Member

@jmikola jmikola commented May 18, 2018

https://jira.mongodb.org/browse/PHPC-1076

Supersedes #818. This includes the bump to libmongoc 1.10-dev and test suite changes for connection strings and skip functions.

Copy link
Contributor

@kvwalker kvwalker left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM other than a change for the commandFailed test

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This test fails because var_dump($event->getReply()) returns an object that includes operationTime, $clusterTime, and signature.

This can be fixed by adding

["operationTime"]=>
  object(MongoDB\BSON\Timestamp)#%d (2) {
    ["increment"]=>
    string(1) "1"
    ["timestamp"]=>
    string(10) "%d"
  }
  ["$clusterTime"]=>
  object(stdClass)#%d (2) {
    ["clusterTime"]=>
    object(MongoDB\BSON\Timestamp)#%d (2) {
      ["increment"]=>
      string(1) "1"
      ["timestamp"]=>
      string(10) "%d"
    }
    ["signature"]=>
    object(stdClass)#%d (2) {
      ["hash"]=>
      object(MongoDB\BSON\Binary)#%d (2) {
        ["data"]=>
        string(20) "%s"
        ["type"]=>
        int(0)
      }
      ["keyId"]=>
      int(0)
    }

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for catching that. It didn't come up with overview.php because I was already using %A there for 3.2 compatibility.

@jmikola
Copy link
Member Author

jmikola commented May 21, 2018

Note: Changes in #841 should address Windows builds.

Copy link
Contributor

@derickr derickr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks OK, but I'd prefer you would rebase this on master after merging #841, to make sure the Windows build is actually addressed.

kvwalker and others added 3 commits May 22, 2018 08:31
MongoDB 3.4 introduced a codeName field to error replies, so we use a wildcard to ignore that for 3.2 servers.
3.6 replica sets may include additional fields in the command response (e.g. operationTime, $clusterTime).
@jmikola jmikola merged commit afa752f into mongodb:master May 22, 2018
jmikola added a commit that referenced this pull request May 22, 2018
@jmikola jmikola deleted the PHPC-1076 branch May 22, 2018 17:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants