8.next: Cake5 compatiblity #75
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ros-uri Issue/69 fix zend diactoros uri
# Conflicts: # .github/workflows/ci.yml # composer.json # config/bootstrap.php # phpstan.neon # phpunit.xml.dist # src/Exception/InvalidProviderException.php # src/Exception/InvalidSettingsException.php # src/Rbac/Rules/AbstractRule.php # src/Rbac/Rules/Owner.php # src/Traits/IsAuthorizedTrait.php # tests/Fixture/PostsFixture.php # tests/Fixture/PostsUsersFixture.php # tests/Fixture/SocialAccountsFixture.php # tests/Fixture/UsersFixture.php # tests/TestCase/Authenticator/CookieAuthenticatorTest.php # tests/TestCase/Authenticator/SocialAuthenticatorTest.php # tests/TestCase/Authenticator/TwoFactorAuthenticatorTest.php # tests/TestCase/Controller/Component/OneTimePasswordAuthenticatorComponentTest.php # tests/TestCase/Middleware/RbacMiddlewareTest.php # tests/TestCase/Middleware/SocialAuthMiddlewareTest.php # tests/TestCase/Middleware/TwoFactorMiddlewareTest.php # tests/TestCase/Rbac/Rules/OwnerTest.php # tests/TestCase/Social/Service/OAuth1ServiceTest.php # tests/TestCase/Social/Service/OAuth2ServiceTest.php # tests/TestCase/Traits/IsAuthorizedTraitTest.php # tests/bootstrap.php # tests/schema.php
LordSimal
commented
Dec 25, 2022
| ['provider' => implode('|', array_keys(Configure::read('OAuth.providers')))] | ||
| ); | ||
| }); | ||
| } |
There was a problem hiding this comment.
This has been moved to the routes() method of the Plugin class
LordSimal
commented
Dec 25, 2022
| @@ -19,25 +19,25 @@ | |||
| * | |||
| * @package CakeDC\Auth\Auth | |||
| */ | |||
| class DefaultWebauthn2fAuthenticationChecker implements Webauthn2fAuthenticationCheckerInterface | |||
There was a problem hiding this comment.
This was just a renamed to match the filename
|
due to the fact that I only checked |
|
@steinkel Should this be in a new branch n.next-cake5 or are we going to renamte PS: I don't see tags for 8.x |
|
Using this branch at CakeDC/users#1015 [WIP] |
|
I'd say tagging 8.x as it is now and using a 9.next-cake5 would be the way to go, thanks! |
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR provides compatibility with the current Cake5 beta-1
This also of course required the following base adjustments in the composer.json
This also updates PHPStan and Psalm to the latest versions as well as PHPUnit to 9.5
I first tried to make CakeDC/Users Cake5 compatible but saw, that this plugin needs to be updated beforehand.
Since the current main branch is
6.next-cake4I first did all the adjustments based on that one.Unfortunately I realized pretty late that
8.next-cake4was present as well.Therefore I just merged 8.next into mine and fixed all the merge conflicts afterwards.