merge 11.next-cake4 and fix conflicts

CakeDC · Oct 27, 2023 · 65cdaae · 65cdaae
2 parents 491a57f + 0de2fd0
commit 65cdaae
Show file tree

Hide file tree

Showing 13 changed files with 986 additions and 34 deletions.
diff --git a/Docs/Documentation/Installation.md b/Docs/Documentation/Installation.md
@@ -14,7 +14,6 @@ If you want to use social login features...
 composer require league/oauth2-facebook:@stable
 composer require league/oauth2-instagram:@stable
 composer require league/oauth2-google:@stable
-composer require league/oauth2-linkedin:@stable
 composer require league/oauth1-client:@stable
 ```
 

diff --git a/Docs/Documentation/Overview.md b/Docs/Documentation/Overview.md
@@ -8,7 +8,7 @@ The plugin itself is already capable of:
 * User registration
 * Account verification by a token sent via email
 * User login (email / password)
-* Social login (Twitter, Facebook, Google, Instagram, LinkedIn)
+* Social login (Twitter, Facebook, Google, Instagram)
 * Password reset based on requesting a token by email and entering a new password
 * User management (add / edit / delete)
 * Simple roles management

diff --git a/Docs/Documentation/SocialAuthentication.md b/Docs/Documentation/SocialAuthentication.md
@@ -6,9 +6,9 @@ We currently support the following providers to perform login as well as to link
 * Facebook
 * Twitter
 * Google
-* LinkedIn
 * Instagram
 * Amazon
+* LinkedIn (deprecated, it's not working with the OAuth 2.0 provider. They switched to OpenID-Connect.)
 
 Please [contact us](https://cakedc.com/contact) if you need to support another provider.
 

diff --git a/Docs/Documentation/Translations.md b/Docs/Documentation/Translations.md
@@ -14,6 +14,7 @@ The Plugin is translated into several languages:
 * Ukrainian (uk) by @yarkm13
 * German (de) by @LordSimal
 * Czech (cs_CZ) by @Mapiiik
+* Dutch (nl_NL) by @StefanvanR
 
 **Note:** To overwrite the plugin translations, create a file inside your project 'resources/locales//{$lang}/' folder, with the name 'Users.po' and add the strings with the new translations.
 

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -60,6 +60,11 @@ parameters:
 			count: 1
 			path: src/Controller/UsersController.php
 
+		-
+			message: "#^Parameter \\#1 \\$object of method Cake\\\\Controller\\\\Controller\\:\\:paginate\\(\\) expects Cake\\\\ORM\\\\Query\\|Cake\\\\ORM\\\\Table\\|string\\|null, Cake\\\\Datasource\\\\RepositoryInterface given\\.$#"
+			count: 1
+			path: src/Controller/UsersController.php
+
 		-
 			message: "#^Parameter \\#2 \\$options of method Cake\\\\Controller\\\\Component\\\\FlashComponent\\:\\:error\\(\\) expects array, string given\\.$#"
 			count: 1

diff --git a/resources/locales/nl_NL/users.mo b/resources/locales/nl_NL/users.mo