Skip to content
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

Wilt develop #828

Merged
merged 12 commits into from
May 1, 2017
Merged

Wilt develop #828

merged 12 commits into from
May 1, 2017

Conversation

bshaffer
Copy link
Owner

@bshaffer bshaffer commented May 1, 2017

Resolves conflicts in #557

Wilt and others added 12 commits April 8, 2015 14:33
Here some suggestions for improving the PHPDoc in the `OAuth2\Controller\TokenController.php`.
Currently in my php code editor it was a bit messy. Proper PHPDoc and variable declaration can really help understanding the working of this OAuth2 module.
Right now I only change this controller, but if you merge this pull request I am very willing to also spend time updating/improving the PHPDoc of any other files in the repo.
Conflicts:
	src/OAuth2/Controller/TokenController.php
	src/OAuth2/Encryption/Jwt.php
	src/OAuth2/Server.php
	src/OAuth2/Storage/Pdo.php
+
changed getQuerystringIdentifier to getQueryStringIdentifier
@bshaffer bshaffer merged commit 5abe923 into develop May 1, 2017
@bshaffer bshaffer deleted the Wilt-develop branch May 1, 2017 16:38
maxailloud pushed a commit to wearekadence/oauth2-server-php that referenced this pull request May 23, 2018
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