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

Maintain | Merge branch 1.4 into master one #1834

Merged
merged 27 commits into from Dec 7, 2021
Merged

Conversation

stloyd
Copy link
Collaborator

@stloyd stloyd commented Dec 7, 2021

No description provided.

stloyd and others added 26 commits August 30, 2021 14:54
Bugfix: Fixed `VkontakteResourceOwner` option: `api_version` to not point to deprecated one
Maintain | Adjust code to run on PHP 8.1
Bugfix | Prevent deprecations on PHP 8.1
Bugfix | Remove direct deprecations in Symfony 5.4
Google Moments API is not available since 2015 (cannot find original Google Blog post, only this one describing that: https://www.igorkromin.net/index.php/2015/06/10/what-to-do-when-the-google-plus-moments-api-is-no-longer-supported/ )
Remove Google Moments API from docs
Maintain | Extract OAuth test case out of `Tests/` folder
# Conflicts:
#	.github/workflows/ci.yaml
#	CHANGELOG.md
#	DependencyInjection/HWIOAuthExtension.php
#	OAuth/ResourceOwner/AppleResourceOwner.php
#	OAuth/ResourceOwner/GenericOAuth1ResourceOwner.php
#	OAuth/State/State.php
#	README.md
#	Resources/config/oauth.xml
#	Security/Http/Authenticator/OAuthAuthenticator.php
#	Tests/Controller/AbstractConnectControllerTest.php
#	Tests/Controller/ConnectControllerRegistrationActionTest.php
#	Tests/Fixtures/User.php
#	Tests/OAuth/ResourceOwner/AmazonResourceOwnerTest.php
#	Tests/OAuth/ResourceOwner/AppleResourceOwnerTest.php
#	Tests/OAuth/ResourceOwner/AsanaResourceOwnerTest.php
#	Tests/OAuth/ResourceOwner/Auth0ResourceOwnerTest.php
#	Tests/OAuth/ResourceOwner/AzureResourceOwnerTest.php
#	Tests/OAuth/ResourceOwner/BitbucketResourceOwnerTest.php
#	Tests/OAuth/ResourceOwner/BitlyResourceOwnerTest.php
#	Tests/OAuth/ResourceOwner/BoxResourceOwnerTest.php
#	Tests/OAuth/ResourceOwner/BufferAppResourceOwnerTest.php
#	Tests/OAuth/ResourceOwner/CleverResourceOwnerTest.php
#	Tests/OAuth/ResourceOwner/DailymotionResourceOwnerTest.php
#	Tests/OAuth/ResourceOwner/DeezerResourceOwnerTest.php
#	Tests/OAuth/ResourceOwner/DeviantartResourceOwnerTest.php
#	Tests/OAuth/ResourceOwner/DiscogsResourceOwnerTest.php
#	Tests/OAuth/ResourceOwner/DisqusResourceOwnerTest.php
#	Tests/OAuth/ResourceOwner/DropboxResourceOwnerTest.php
#	Tests/OAuth/ResourceOwner/EveOnlineResourceOwnerTest.php
#	Tests/OAuth/ResourceOwner/EventbriteResourceOwnerTest.php
#	Tests/OAuth/ResourceOwner/FlickrResourceOwnerTest.php
#	Tests/OAuth/ResourceOwner/FoursquareResourceOwnerTest.php
#	Tests/OAuth/ResourceOwner/GenericOAuth1ResourceOwnerTest.php
#	Tests/OAuth/ResourceOwner/GenericOAuth2ResourceOwnerTest.php
#	Tests/OAuth/ResourceOwner/GeniusResourceOwnerTest.php
#	Tests/OAuth/ResourceOwner/GitHubResourceOwnerTest.php
#	Tests/OAuth/ResourceOwner/GitLabResourceOwnerTest.php
#	Tests/OAuth/ResourceOwner/GoogleResourceOwnerTest.php
#	Tests/OAuth/ResourceOwner/HubicResourceOwnerTest.php
#	Tests/OAuth/ResourceOwner/InstagramResourceOwnerTest.php
#	Tests/OAuth/ResourceOwner/ItembaseResourceOwnerTest.php
#	Tests/OAuth/ResourceOwner/JiraResourceOwnerTest.php
#	Tests/OAuth/ResourceOwner/KeycloakResourceOwnerTest.php
#	Tests/OAuth/ResourceOwner/LinkedinResourceOwnerTest.php
#	Tests/OAuth/ResourceOwner/MailRuResourceOwnerTest.php
#	Tests/OAuth/ResourceOwner/OdnoklassnikiResourceOwnerTest.php
#	Tests/OAuth/ResourceOwner/Office365ResourceOwnerTest.php
#	Tests/OAuth/ResourceOwner/PaypalResourceOwnerTest.php
#	Tests/OAuth/ResourceOwner/QQResourceOwnerTest.php
#	Tests/OAuth/ResourceOwner/RedditResourceOwnerTest.php
#	Tests/OAuth/ResourceOwner/SalesforceResourceOwnerTest.php
#	Tests/OAuth/ResourceOwner/SensioConnectResourceOwnerTest.php
#	Tests/OAuth/ResourceOwner/SinaWeiboResourceOwnerTest.php
#	Tests/OAuth/ResourceOwner/SlackResourceOwnerTest.php
#	Tests/OAuth/ResourceOwner/SoundcloudResourceOwnerTest.php
#	Tests/OAuth/ResourceOwner/SpotifyResourceOwnerTest.php
#	Tests/OAuth/ResourceOwner/StackExchangeResourceOwnerTest.php
#	Tests/OAuth/ResourceOwner/StereomoodResourceOwnerTest.php
#	Tests/OAuth/ResourceOwner/StravaResourceOwnerTest.php
#	Tests/OAuth/ResourceOwner/ThirtySevenSignalsResourceOwnerTest.php
#	Tests/OAuth/ResourceOwner/ToshlResourceOwnerTest.php
#	Tests/OAuth/ResourceOwner/TraktResourceOwnerTest.php
#	Tests/OAuth/ResourceOwner/TrelloResourceOwnerTest.php
#	Tests/OAuth/ResourceOwner/TwitchResourceOwnerTest.php
#	Tests/OAuth/ResourceOwner/TwitterResourceOwnerTest.php
#	Tests/OAuth/ResourceOwner/VkontakteResourceOwnerTest.php
#	Tests/OAuth/ResourceOwner/WindowsLiveResourceOwnerTest.php
#	Tests/OAuth/ResourceOwner/WordpressResourceOwnerTest.php
#	Tests/OAuth/ResourceOwner/XingResourceOwnerTest.php
#	Tests/OAuth/ResourceOwner/YahooResourceOwnerTest.php
#	Tests/OAuth/ResourceOwner/YandexResourceOwnerTest.php
#	Tests/OAuth/ResourceOwner/YoutubeResourceOwnerTest.php
#	Tests/Security/Core/Authentication/Provider/OAuthProviderTest.php
#	composer.json
# Conflicts:
#	README.md
#	Security/Core/Authentication/Provider/OAuthProvider.php
#	Security/Core/Authentication/Token/AbstractOAuthToken.php
#	Security/Core/Exception/AccountNotLinkedException.php
#	Templating/Helper/OAuthHelper.php
#	Tests/Security/Core/Authentication/Provider/OAuthProviderTest.php
#	Tests/Security/Core/Authentication/Token/OAuthTokenTest.php
#	Tests/Security/Core/User/OAuthUserProviderTest.php
#	Tests/Security/Http/Authenticator/OAuthAuthenticatorTest.php
#	composer.json
@stloyd stloyd merged commit a28b3fb into hwi:master Dec 7, 2021
@stloyd stloyd deleted the take-1dot4 branch December 7, 2021 10:12
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.

None yet

4 participants