Skip to content

[3.x] Fixed bad merge #950

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 1 commit into from
Dec 12, 2020
Merged

[3.x] Fixed bad merge #950

merged 1 commit into from
Dec 12, 2020

Conversation

GrahamCampbell
Copy link
Contributor

@GrahamCampbell GrahamCampbell commented Dec 12, 2020

Fixes issues introduced by e39e78c.

@acrobat
Copy link
Collaborator

acrobat commented Dec 12, 2020

Thank you @GrahamCampbell

@GrahamCampbell GrahamCampbell deleted the fix-merge branch December 12, 2020 18:26
acrobat added a commit that referenced this pull request Dec 16, 2020
…(GrahamCampbell)

This PR was merged into the 3.0.x-dev branch.

Discussion
----------

I've **not** added return types to all the API methods. If that is wanted, it could be followed up with an additional PR, but we'd have to be very confident all the return type phpdoc was correct before making them real return types (indeed, not all the methods in there even have documented return types)!

---

Depends on #950.

Commits
-------

215d5fa Added some additional scalar types and return types
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.

2 participants