Skip to content

v1.3.1 - Merge duration and documentation fixes #111

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 5 commits into from
May 12, 2017
Merged

v1.3.1 - Merge duration and documentation fixes #111

merged 5 commits into from
May 12, 2017

Conversation

mpenick
Copy link
Contributor

@mpenick mpenick commented Apr 28, 2017

No description provided.

mpenick and others added 4 commits April 27, 2017 14:35
…docs and tests

* Updated ExecutionOptions.yaml and Session.yaml to move execution option descriptions to a table in Session.execute's method description.
* Cleaned up Session.executeGraph execution options to be in a table in the method description.
* Update ExecutionOptions::__construct refs in Core.yaml to point to Session.execute().
* Moved common doc generator functionality into a common file.
* Fixed unnecessary use of '{@inheritdoc}' in cases that wouldn't
  be caught by the `doc_generate_yaml.php` updates.
* When generating the PHP API comments will be inherited from the
  parent if the subclass's comment is empty.
* Fixed invalid `Dse\Table` comment
* Fixed wrapping @return comments
Copy link
Contributor

@mikefero mikefero left a comment

Choose a reason for hiding this comment

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

Merge looks good; looks like the cpp-driver submodule needs to be updated to point to the latest version in master for acceptable cpp-driver dependency version (that can wait until after cpp-driver release to point to the release tag if desired).

@@ -533,4 +531,4 @@ The PHP Driver follows the architecture of [the C/C++ Driver](http://datastax.gi

### Persistent sessions
Copy link
Contributor

Choose a reason for hiding this comment

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

I feel we can remove this section entirely from the Architecture portion as Persistent Sessions are discussed at the beginning of this documentation.

@mpenick mpenick merged commit 6432776 into master May 12, 2017
@mpenick mpenick deleted the v1.3.1 branch May 17, 2017 13:42
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