Skip to content

Commit 506f0be

Browse files
authored
Merge branch 'master' into add/login-nonce-failure-logging
2 parents 5af715b + 949d290 commit 506f0be

5 files changed

Lines changed: 54 additions & 45 deletions

File tree

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"phpcompatibility/phpcompatibility-wp": "3.0.0-alpha2",
3030
"phpunit/phpunit": "^8.5|^9.6",
3131
"spatie/phpunit-watcher": "^1.23",
32-
"szepeviktor/phpstan-wordpress": "^1.3",
32+
"szepeviktor/phpstan-wordpress": "^2.0",
3333
"wp-coding-standards/wpcs": "^3.3",
3434
"yoast/phpunit-polyfills": "^4.0"
3535
},

‎composer.lock‎

Lines changed: 39 additions & 28 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package-lock.json‎

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎phpstan.dist.neon‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@ includes:
22
- vendor/szepeviktor/phpstan-wordpress/extension.neon
33
parameters:
44
level: 5
5+
# Runtime values in WordPress are not guaranteed to match the documented types.
6+
treatPhpDocTypesAsCertain: false
57
paths:
6-
- includes
78
- providers
89
- settings
910
- class-two-factor-compat.php

‎settings/class-two-factor-settings.php‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,9 @@ static function ( $value ) {
5252
}
5353

5454
// Build provider list for display using public core API.
55-
$provider_instances = array();
56-
if ( class_exists( 'Two_Factor_Core' ) && method_exists( 'Two_Factor_Core', 'get_providers' ) ) {
57-
$provider_instances = Two_Factor_Core::get_providers();
58-
if ( ! is_array( $provider_instances ) ) {
59-
$provider_instances = array();
60-
}
55+
$provider_instances = Two_Factor_Core::get_providers();
56+
if ( ! is_array( $provider_instances ) ) {
57+
$provider_instances = array();
6158
}
6259

6360
// Default to all providers enabled when the option has never been saved.

0 commit comments

Comments
 (0)