Skip to content

Use key as string without a temporary file #1180

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 8 commits into from
Jul 12, 2021

Conversation

ssigwart
Copy link
Contributor

Copy link
Member

@Sephster Sephster left a comment

Choose a reason for hiding this comment

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

I think we are removing the ability to use a password against the private key here. Is it possible to change this to accommodate this? Thanks for your submission.

Copy link
Contributor Author

@ssigwart ssigwart left a comment

Choose a reason for hiding this comment

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

Thanks for looking @Sephster. I think my change addresses your comment.

@ssigwart
Copy link
Contributor Author

@Sephster, is there anything I should do to get this merged?

@ssigwart
Copy link
Contributor Author

@Sephster, there are merge conflicts now. Should I rebase and resolve them?

@Sephster
Copy link
Member

That would be appreciated cheers. I've been tidying up a personal project but hoping to get back to this within the week. Thanks very much

@ssigwart
Copy link
Contributor Author

Thanks, @Sephster. I rebased it and fixed the conflicts.

@Sephster
Copy link
Member

Sephster commented Jul 10, 2021

@ssigwart would it be possible for you to resolve the conflict? I tried to do this myself but don't have write access to your branch. There is also a trailing comma on line 80 of the BearerToken file which is causing issues in PHP 7.2. Everything else looks good so happy to merge in once this is resolved. Thank you

@ssigwart
Copy link
Contributor Author

@Sephster, I fixed the trailing comma and rebased to fix the conflict. Thanks!

@Sephster Sephster merged commit 35fc377 into thephpleague:master Jul 12, 2021
@Sephster
Copy link
Member

Thanks @ssigwart - looks great.

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