diff --git a/composer.json b/composer.json
index 36026f5..ac3808a 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
"phpcompatibility/phpcompatibility-wp": "^2.1",
"phpunit/phpunit": "^9",
"psalm/plugin-phpunit": "^0.18.0",
- "vimeo/psalm": "^4.7",
+ "vimeo/psalm": "^5.0",
"wp-cli/wp-cli": "^2.6",
"wp-coding-standards/wpcs": "^2.3"
},
diff --git a/composer.lock b/composer.lock
index b83838b..612b3ba 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "8a447e032d010e0de8121d95e67547e6",
+ "content-hash": "477b4000c5fff371f7c8e4fab9c004f4",
"packages": [
{
"name": "composer/installers",
@@ -1042,6 +1042,67 @@
},
"time": "2022-03-02T22:36:06+00:00"
},
+ {
+ "name": "fidry/cpu-core-counter",
+ "version": "0.5.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/theofidry/cpu-core-counter.git",
+ "reference": "b58e5a3933e541dc286cc91fc4f3898bbc6f1623"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/b58e5a3933e541dc286cc91fc4f3898bbc6f1623",
+ "reference": "b58e5a3933e541dc286cc91fc4f3898bbc6f1623",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^7.2 || ^8.0"
+ },
+ "require-dev": {
+ "fidry/makefile": "^0.2.0",
+ "phpstan/extension-installer": "^1.2.0",
+ "phpstan/phpstan": "^1.9.2",
+ "phpstan/phpstan-deprecation-rules": "^1.0.0",
+ "phpstan/phpstan-phpunit": "^1.2.2",
+ "phpstan/phpstan-strict-rules": "^1.4.4",
+ "phpunit/phpunit": "^9.5.26 || ^8.5.31",
+ "theofidry/php-cs-fixer-config": "^1.0",
+ "webmozarts/strict-phpunit": "^7.5"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "Fidry\\CpuCoreCounter\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Théo FIDRY",
+ "email": "theo.fidry@gmail.com"
+ }
+ ],
+ "description": "Tiny utility to get the number of CPU cores.",
+ "keywords": [
+ "CPU",
+ "core"
+ ],
+ "support": {
+ "issues": "https://github.com/theofidry/cpu-core-counter/issues",
+ "source": "https://github.com/theofidry/cpu-core-counter/tree/0.5.1"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/theofidry",
+ "type": "github"
+ }
+ ],
+ "time": "2022-12-24T12:35:10+00:00"
+ },
{
"name": "johnpbloch/wordpress-core",
"version": "6.1.1",
@@ -1306,59 +1367,6 @@
},
"time": "2023-01-16T22:05:37+00:00"
},
- {
- "name": "openlss/lib-array2xml",
- "version": "1.0.0",
- "source": {
- "type": "git",
- "url": "https://github.com/nullivex/lib-array2xml.git",
- "reference": "a91f18a8dfc69ffabe5f9b068bc39bb202c81d90"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/nullivex/lib-array2xml/zipball/a91f18a8dfc69ffabe5f9b068bc39bb202c81d90",
- "reference": "a91f18a8dfc69ffabe5f9b068bc39bb202c81d90",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.2"
- },
- "type": "library",
- "autoload": {
- "psr-0": {
- "LSS": ""
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "Apache-2.0"
- ],
- "authors": [
- {
- "name": "Bryan Tong",
- "email": "bryan@nullivex.com",
- "homepage": "https://www.nullivex.com"
- },
- {
- "name": "Tony Butler",
- "email": "spudz76@gmail.com",
- "homepage": "https://www.nullivex.com"
- }
- ],
- "description": "Array2XML conversion library credit to lalit.org",
- "homepage": "https://www.nullivex.com",
- "keywords": [
- "array",
- "array conversion",
- "xml",
- "xml conversion"
- ],
- "support": {
- "issues": "https://github.com/nullivex/lib-array2xml/issues",
- "source": "https://github.com/nullivex/lib-array2xml/tree/master"
- },
- "time": "2019-03-29T20:06:56+00:00"
- },
{
"name": "phar-io/manifest",
"version": "2.0.3",
@@ -3557,6 +3565,70 @@
},
"time": "2023-01-05T18:45:16+00:00"
},
+ {
+ "name": "spatie/array-to-xml",
+ "version": "2.17.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/spatie/array-to-xml.git",
+ "reference": "5cbec9c6ab17e320c58a259f0cebe88bde4a7c46"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/spatie/array-to-xml/zipball/5cbec9c6ab17e320c58a259f0cebe88bde4a7c46",
+ "reference": "5cbec9c6ab17e320c58a259f0cebe88bde4a7c46",
+ "shasum": ""
+ },
+ "require": {
+ "ext-dom": "*",
+ "php": "^7.4|^8.0"
+ },
+ "require-dev": {
+ "mockery/mockery": "^1.2",
+ "pestphp/pest": "^1.21",
+ "phpunit/phpunit": "^9.0",
+ "spatie/pest-plugin-snapshots": "^1.1"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "Spatie\\ArrayToXml\\": "src"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Freek Van der Herten",
+ "email": "freek@spatie.be",
+ "homepage": "https://freek.dev",
+ "role": "Developer"
+ }
+ ],
+ "description": "Convert an array to xml",
+ "homepage": "https://github.com/spatie/array-to-xml",
+ "keywords": [
+ "array",
+ "convert",
+ "xml"
+ ],
+ "support": {
+ "source": "https://github.com/spatie/array-to-xml/tree/2.17.1"
+ },
+ "funding": [
+ {
+ "url": "https://spatie.be/open-source/support-us",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/spatie",
+ "type": "github"
+ }
+ ],
+ "time": "2022-12-26T08:22:07+00:00"
+ },
{
"name": "squizlabs/php_codesniffer",
"version": "3.7.2",
@@ -3780,6 +3852,70 @@
],
"time": "2022-01-02T09:53:40+00:00"
},
+ {
+ "name": "symfony/filesystem",
+ "version": "v5.4.19",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/filesystem.git",
+ "reference": "648bfaca6a494f3e22378123bcee2894045dc9d8"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/filesystem/zipball/648bfaca6a494f3e22378123bcee2894045dc9d8",
+ "reference": "648bfaca6a494f3e22378123bcee2894045dc9d8",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=7.2.5",
+ "symfony/polyfill-ctype": "~1.8",
+ "symfony/polyfill-mbstring": "~1.8",
+ "symfony/polyfill-php80": "^1.16"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "Symfony\\Component\\Filesystem\\": ""
+ },
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
+ ],
+ "description": "Provides basic utilities for the filesystem",
+ "homepage": "https://symfony.com",
+ "support": {
+ "source": "https://github.com/symfony/filesystem/tree/v5.4.19"
+ },
+ "funding": [
+ {
+ "url": "https://symfony.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2023-01-14T19:14:44+00:00"
+ },
{
"name": "symfony/finder",
"version": "v5.4.19",
@@ -4556,24 +4692,24 @@
},
{
"name": "vimeo/psalm",
- "version": "4.30.0",
+ "version": "5.7.6",
"source": {
"type": "git",
"url": "https://github.com/vimeo/psalm.git",
- "reference": "d0bc6e25d89f649e4f36a534f330f8bb4643dd69"
+ "reference": "ae4ec68e00e4880e3f00b1edd2da891236d749ab"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/vimeo/psalm/zipball/d0bc6e25d89f649e4f36a534f330f8bb4643dd69",
- "reference": "d0bc6e25d89f649e4f36a534f330f8bb4643dd69",
+ "url": "https://api.github.com/repos/vimeo/psalm/zipball/ae4ec68e00e4880e3f00b1edd2da891236d749ab",
+ "reference": "ae4ec68e00e4880e3f00b1edd2da891236d749ab",
"shasum": ""
},
"require": {
"amphp/amp": "^2.4.2",
"amphp/byte-stream": "^1.5",
- "composer/package-versions-deprecated": "^1.8.0",
+ "composer/package-versions-deprecated": "^1.10.0",
"composer/semver": "^1.4 || ^2.0 || ^3.0",
- "composer/xdebug-handler": "^1.1 || ^2.0 || ^3.0",
+ "composer/xdebug-handler": "^2.0 || ^3.0",
"dnoegel/php-xdg-base-dir": "^0.1.1",
"ext-ctype": "*",
"ext-dom": "*",
@@ -4582,35 +4718,34 @@
"ext-mbstring": "*",
"ext-simplexml": "*",
"ext-tokenizer": "*",
- "felixfbecker/advanced-json-rpc": "^3.0.3",
- "felixfbecker/language-server-protocol": "^1.5",
+ "felixfbecker/advanced-json-rpc": "^3.1",
+ "felixfbecker/language-server-protocol": "^1.5.2",
+ "fidry/cpu-core-counter": "^0.4.1 || ^0.5.1",
"netresearch/jsonmapper": "^1.0 || ^2.0 || ^3.0 || ^4.0",
"nikic/php-parser": "^4.13",
- "openlss/lib-array2xml": "^1.0",
- "php": "^7.1|^8",
- "sebastian/diff": "^3.0 || ^4.0",
- "symfony/console": "^3.4.17 || ^4.1.6 || ^5.0 || ^6.0",
- "symfony/polyfill-php80": "^1.25",
- "webmozart/path-util": "^2.3"
+ "php": "^7.4 || ~8.0.0 || ~8.1.0 || ~8.2.0",
+ "sebastian/diff": "^4.0 || ^5.0",
+ "spatie/array-to-xml": "^2.17.0 || ^3.0",
+ "symfony/console": "^4.1.6 || ^5.0 || ^6.0",
+ "symfony/filesystem": "^5.4 || ^6.0"
},
"provide": {
"psalm/psalm": "self.version"
},
"require-dev": {
- "bamarni/composer-bin-plugin": "^1.2",
- "brianium/paratest": "^4.0||^6.0",
+ "bamarni/composer-bin-plugin": "^1.4",
+ "brianium/paratest": "^6.9",
"ext-curl": "*",
+ "mockery/mockery": "^1.5",
+ "nunomaduro/mock-final-classes": "^1.1",
"php-parallel-lint/php-parallel-lint": "^1.2",
- "phpdocumentor/reflection-docblock": "^5",
- "phpmyadmin/sql-parser": "5.1.0||dev-master",
- "phpspec/prophecy": ">=1.9.0",
- "phpstan/phpdoc-parser": "1.2.* || 1.6.4",
- "phpunit/phpunit": "^9.0",
- "psalm/plugin-phpunit": "^0.16",
- "slevomat/coding-standard": "^7.0",
- "squizlabs/php_codesniffer": "^3.5",
- "symfony/process": "^4.3 || ^5.0 || ^6.0",
- "weirdan/prophecy-shim": "^1.0 || ^2.0"
+ "phpstan/phpdoc-parser": "^1.6",
+ "phpunit/phpunit": "^9.6",
+ "psalm/plugin-mockery": "^1.1",
+ "psalm/plugin-phpunit": "^0.18",
+ "slevomat/coding-standard": "^8.4",
+ "squizlabs/php_codesniffer": "^3.6",
+ "symfony/process": "^4.4 || ^5.0 || ^6.0"
},
"suggest": {
"ext-curl": "In order to send data to shepherd",
@@ -4626,17 +4761,14 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.x-dev",
+ "dev-master": "5.x-dev",
+ "dev-4.x": "4.x-dev",
"dev-3.x": "3.x-dev",
"dev-2.x": "2.x-dev",
"dev-1.x": "1.x-dev"
}
},
"autoload": {
- "files": [
- "src/functions.php",
- "src/spl_object_id.php"
- ],
"psr-4": {
"Psalm\\": "src/Psalm/"
}
@@ -4654,13 +4786,14 @@
"keywords": [
"code",
"inspection",
- "php"
+ "php",
+ "static analysis"
],
"support": {
"issues": "https://github.com/vimeo/psalm/issues",
- "source": "https://github.com/vimeo/psalm/tree/4.30.0"
+ "source": "https://github.com/vimeo/psalm/tree/5.7.6"
},
- "time": "2022-11-06T20:37:08+00:00"
+ "time": "2023-02-24T19:45:16+00:00"
},
{
"name": "webmozart/assert",
@@ -4720,57 +4853,6 @@
},
"time": "2022-06-03T18:03:27+00:00"
},
- {
- "name": "webmozart/path-util",
- "version": "2.3.0",
- "source": {
- "type": "git",
- "url": "https://github.com/webmozart/path-util.git",
- "reference": "d939f7edc24c9a1bb9c0dee5cb05d8e859490725"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/webmozart/path-util/zipball/d939f7edc24c9a1bb9c0dee5cb05d8e859490725",
- "reference": "d939f7edc24c9a1bb9c0dee5cb05d8e859490725",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.3",
- "webmozart/assert": "~1.0"
- },
- "require-dev": {
- "phpunit/phpunit": "^4.6",
- "sebastian/version": "^1.0.1"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.3-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Webmozart\\PathUtil\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Bernhard Schussek",
- "email": "bschussek@gmail.com"
- }
- ],
- "description": "A robust cross-platform utility for normalizing, comparing and modifying file paths.",
- "support": {
- "issues": "https://github.com/webmozart/path-util/issues",
- "source": "https://github.com/webmozart/path-util/tree/2.3.0"
- },
- "abandoned": "symfony/filesystem",
- "time": "2015-12-17T08:42:14+00:00"
- },
{
"name": "wp-cli/mustangostang-spyc",
"version": "0.6.3",
diff --git a/inc/class-authenticator.php b/inc/class-authenticator.php
index ca58b37..765516d 100644
--- a/inc/class-authenticator.php
+++ b/inc/class-authenticator.php
@@ -24,7 +24,6 @@ public function init(): void {
* WP_Error or null otherwise.
* @param string $username Username or email address.
* @return null|WP_User|WP_Error
- * @psalm-suppress RedundantCastGivenDocblockType
*/
public function authenticate( $user, $username ) {
if ( ! is_wp_error( $user ) ) {
@@ -49,8 +48,7 @@ public function authenticate( $user, $username ) {
/**
* @param string $error Login error message.
- * @return string
- * @psalm-suppress RedundantCastGivenDocblockType
+ * @return string
*/
public function login_errors( $error ): string {
global $errors;
diff --git a/inc/class-ip-api.php b/inc/class-ip-api.php
index 3a75ae7..e23bb9f 100644
--- a/inc/class-ip-api.php
+++ b/inc/class-ip-api.php
@@ -148,7 +148,7 @@ private static function decode_entry( $entry ): ?array {
'as' => $entry['as'] ?? '',
'mobile' => isset( $entry['mobile'] ) ? (bool) $entry['mobile'] : null,
'proxy' => isset( $entry['proxy'] ) ? (bool) $entry['proxy'] : null,
- 'hosting' => isset( $entry['hosting'] ) ? (bool) $entry['proxy'] : null,
+ 'hosting' => isset( $entry['hosting'] ) ? (bool) $entry['hosting'] : null,
];
$key = self::get_cache_key( $data['ip'] );
diff --git a/inc/class-location-watcher.php b/inc/class-location-watcher.php
index 523979c..495bb8a 100644
--- a/inc/class-location-watcher.php
+++ b/inc/class-location-watcher.php
@@ -61,7 +61,7 @@ public function wp_login( $_user_login, WP_User $user ): void {
}
/**
- * @param mixed[] $info
+ * @param mixed[] $info
* @return mixed[]
*/
public function attach_session_information( array $info ): array {
diff --git a/inc/class-login-limiter.php b/inc/class-login-limiter.php
index d71ef6d..c5c175b 100644
--- a/inc/class-login-limiter.php
+++ b/inc/class-login-limiter.php
@@ -32,7 +32,6 @@ public function init(): void {
public function wp_login_failed( $username_or_email ): void {
$ip = Utils::get_ip();
if ( $ip ) {
- /** @psalm-suppress RedundantCastGivenDocblockType */
list( $key1, $key2 ) = $this->get_cache_keys( (string) $username_or_email, $ip );
wp_cache_add( $key1, 0, self::CACHE_GROUP, 10 * MINUTE_IN_SECONDS );
@@ -45,7 +44,6 @@ public function wp_login_failed( $username_or_email ): void {
/**
* @param string $username
- * @psalm-suppress RedundantCastGivenDocblockType
*/
public function wp_login( $username ): void {
$ip = Utils::get_ip();
@@ -70,7 +68,6 @@ public function wp_login( $username ): void {
* @param string $username Username or email address.
* @param string $password User password
* @return null|WP_User|WP_Error
- * @psalm-suppress RedundantCastGivenDocblockType
*/
public function authenticate( $user, $username, $password ) {
if ( ! empty( $username ) && ! empty( $password ) ) {
@@ -92,7 +89,6 @@ public function login_form_login(): void {
if ( 'POST' === Utils::get_request_method() && ! empty( $_POST['log'] ) && is_scalar( $_POST['log'] ) ) {
$ip = Utils::get_ip();
if ( $ip ) {
- /** @psalm-suppress RedundantCast */
$username = sanitize_user( wp_unslash( (string) $_POST['log'] ) );
$limited = $this->check_limits( $username, $ip );
if ( is_wp_error( $limited ) ) {
diff --git a/inc/class-login-logger.php b/inc/class-login-logger.php
index edc7a8b..7e0fbed 100644
--- a/inc/class-login-logger.php
+++ b/inc/class-login-logger.php
@@ -24,7 +24,6 @@ public function init(): void {
* WP_Error or null otherwise.
* @param string $username Username or email address.
* @return null|WP_User|WP_Error
- * @psalm-suppress RedundantCastGivenDocblockType
*/
public function authenticate( $user, $username ) {
$message = sprintf( 'Login attempt: %s', $this->construct_message( (string) $username ) );
@@ -33,8 +32,7 @@ public function authenticate( $user, $username ) {
}
/**
- * @param string $login
- * @psalm-suppress RedundantCastGivenDocblockType
+ * @param string $login
*/
public function wp_login( $login ): void {
$message = sprintf( 'Login successful: %s', $this->construct_message( (string) $login ) );
@@ -42,8 +40,7 @@ public function wp_login( $login ): void {
}
/**
- * @param string $login
- * @psalm-suppress RedundantCastGivenDocblockType
+ * @param string $login
*/
public function wp_login_failed( $login ): void {
$user = Auth_Utils::get_user_by_login_or_email( (string) $login );
diff --git a/psalm.xml.dist b/psalm.xml.dist
index f441cc4..4989c55 100644
--- a/psalm.xml.dist
+++ b/psalm.xml.dist
@@ -4,6 +4,8 @@
resolveFromConfigFile="true"
phpVersion="7.4"
findUnusedPsalmSuppress="true"
+ findUnusedCode="true"
+ findUnusedBaselineEntry="true"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="https://getpsalm.org/schema/config"
xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
@@ -12,6 +14,13 @@
+
+
+
+
+
+
+