diff --git a/composer.json b/composer.json index d7d7892c62..0cf0bfcded 100755 --- a/composer.json +++ b/composer.json @@ -8,7 +8,6 @@ "php": "^7.4 || ^8", "automattic/jetpack-changelogger": "3.3.5", "bamarni/composer-bin-plugin": "1.8.2", - "dealerdirect/phpcodesniffer-composer-installer": "1.0.0", "dms/phpunit-arraysubset-asserts": "0.5.0", "humbug/php-scoper": "0.15.0", "pelago/emogrifier": "7.0.0", @@ -16,10 +15,9 @@ "phpcompatibility/phpcompatibility-wp": "2.1.4", "sirbrillig/phpcs-no-get-current-user": "1.1.0", "sirbrillig/phpcs-variable-analysis": "2.11.16", - "squizlabs/php_codesniffer": "3.7.2", "symfony/polyfill-php80": "1.16.0", "vimeo/psalm": "4.22.0", - "wp-coding-standards/wpcs": "2.3.0", + "wp-coding-standards/wpcs": "3.0.1", "yoast/phpunit-polyfills": "2.0.0" }, "minimum-stability": "dev", @@ -98,8 +96,8 @@ "php": "7.4" }, "allow-plugins": { - "dealerdirect/phpcodesniffer-composer-installer": true, - "bamarni/composer-bin-plugin": true + "bamarni/composer-bin-plugin": true, + "dealerdirect/phpcodesniffer-composer-installer": true } }, "extra": { diff --git a/composer.lock b/composer.lock index acfe5adb1c..c5edccfd10 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": "0e4302cd363bf4222e4336cdeeee607e", + "content-hash": "bc69057726243faa562ab94e67ae6f6c", "packages": [ { "name": "woocommerce/action-scheduler", @@ -409,20 +409,20 @@ }, { "name": "composer/pcre", - "version": "2.1.0", + "version": "3.1.1", "source": { "type": "git", "url": "https://github.com/composer/pcre.git", - "reference": "3fdb2807b31a78a40ad89570e30ec77466c98717" + "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/pcre/zipball/3fdb2807b31a78a40ad89570e30ec77466c98717", - "reference": "3fdb2807b31a78a40ad89570e30ec77466c98717", + "url": "https://api.github.com/repos/composer/pcre/zipball/00104306927c7a0919b4ced2aaa6782c1e61a3c9", + "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9", "shasum": "" }, "require": { - "php": "^7.2 || ^8.0" + "php": "^7.4 || ^8.0" }, "require-dev": { "phpstan/phpstan": "^1.3", @@ -432,7 +432,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "2.x-dev" + "dev-main": "3.x-dev" } }, "autoload": { @@ -460,7 +460,7 @@ ], "support": { "issues": "https://github.com/composer/pcre/issues", - "source": "https://github.com/composer/pcre/tree/2.1.0" + "source": "https://github.com/composer/pcre/tree/3.1.1" }, "funding": [ { @@ -476,20 +476,20 @@ "type": "tidelift" } ], - "time": "2022-11-16T18:32:04+00:00" + "time": "2023-10-11T07:11:09+00:00" }, { "name": "composer/semver", - "version": "3.3.2", + "version": "3.4.0", "source": { "type": "git", "url": "https://github.com/composer/semver.git", - "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9" + "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/semver/zipball/3953f23262f2bff1919fc82183ad9acb13ff62c9", - "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9", + "url": "https://api.github.com/repos/composer/semver/zipball/35e8d0af4486141bc745f23a29cc2091eb624a32", + "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32", "shasum": "" }, "require": { @@ -539,9 +539,9 @@ "versioning" ], "support": { - "irc": "irc://irc.freenode.org/composer", + "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/semver/issues", - "source": "https://github.com/composer/semver/tree/3.3.2" + "source": "https://github.com/composer/semver/tree/3.4.0" }, "funding": [ { @@ -557,7 +557,7 @@ "type": "tidelift" } ], - "time": "2022-04-01T19:23:25+00:00" + "time": "2023-08-31T09:50:34+00:00" }, { "name": "composer/xdebug-handler", @@ -784,6 +784,53 @@ }, "time": "2019-12-04T15:06:13+00:00" }, + { + "name": "doctrine/deprecations", + "version": "1.1.3", + "source": { + "type": "git", + "url": "https://github.com/doctrine/deprecations.git", + "reference": "dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/deprecations/zipball/dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab", + "reference": "dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab", + "shasum": "" + }, + "require": { + "php": "^7.1 || ^8.0" + }, + "require-dev": { + "doctrine/coding-standard": "^9", + "phpstan/phpstan": "1.4.10 || 1.10.15", + "phpstan/phpstan-phpunit": "^1.0", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", + "psalm/plugin-phpunit": "0.18.4", + "psr/log": "^1 || ^2 || ^3", + "vimeo/psalm": "4.30.0 || 5.12.0" + }, + "suggest": { + "psr/log": "Allows logging deprecations via PSR-3 logger implementation" + }, + "type": "library", + "autoload": { + "psr-4": { + "Doctrine\\Deprecations\\": "lib/Doctrine/Deprecations" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "A small layer on top of trigger_error(E_USER_DEPRECATED) or PSR-3 logging with options to disable all deprecations or selectively for packages.", + "homepage": "https://www.doctrine-project.org/", + "support": { + "issues": "https://github.com/doctrine/deprecations/issues", + "source": "https://github.com/doctrine/deprecations/tree/1.1.3" + }, + "time": "2024-01-30T19:34:25+00:00" + }, { "name": "doctrine/instantiator", "version": "1.5.0", @@ -1145,16 +1192,16 @@ }, { "name": "netresearch/jsonmapper", - "version": "v4.2.0", + "version": "v4.4.1", "source": { "type": "git", "url": "https://github.com/cweiske/jsonmapper.git", - "reference": "f60565f8c0566a31acf06884cdaa591867ecc956" + "reference": "132c75c7dd83e45353ebb9c6c9f591952995bbf0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/f60565f8c0566a31acf06884cdaa591867ecc956", - "reference": "f60565f8c0566a31acf06884cdaa591867ecc956", + "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/132c75c7dd83e45353ebb9c6c9f591952995bbf0", + "reference": "132c75c7dd83e45353ebb9c6c9f591952995bbf0", "shasum": "" }, "require": { @@ -1165,7 +1212,7 @@ "php": ">=7.1" }, "require-dev": { - "phpunit/phpunit": "~7.5 || ~8.0 || ~9.0", + "phpunit/phpunit": "~7.5 || ~8.0 || ~9.0 || ~10.0", "squizlabs/php_codesniffer": "~3.5" }, "type": "library", @@ -1190,22 +1237,22 @@ "support": { "email": "cweiske@cweiske.de", "issues": "https://github.com/cweiske/jsonmapper/issues", - "source": "https://github.com/cweiske/jsonmapper/tree/v4.2.0" + "source": "https://github.com/cweiske/jsonmapper/tree/v4.4.1" }, - "time": "2023-04-09T17:37:40+00:00" + "time": "2024-01-31T06:18:54+00:00" }, { "name": "nikic/php-parser", - "version": "v4.16.0", + "version": "v4.18.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "19526a33fb561ef417e822e85f08a00db4059c17" + "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/19526a33fb561ef417e822e85f08a00db4059c17", - "reference": "19526a33fb561ef417e822e85f08a00db4059c17", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/1bcbb2179f97633e98bbbc87044ee2611c7d7999", + "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999", "shasum": "" }, "require": { @@ -1246,9 +1293,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.16.0" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.18.0" }, - "time": "2023-06-25T14:52:30+00:00" + "time": "2023-12-10T21:03:43+00:00" }, { "name": "openlss/lib-array2xml", @@ -1494,28 +1541,31 @@ }, { "name": "php-stubs/wordpress-stubs", - "version": "v6.3.0", + "version": "v6.4.3", "source": { "type": "git", "url": "https://github.com/php-stubs/wordpress-stubs.git", - "reference": "adda7609e71d5f4dc7b87c74f8ec9e3437d2e92c" + "reference": "6105bdab2f26c0204fe90ecc53d5684754550e8f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-stubs/wordpress-stubs/zipball/adda7609e71d5f4dc7b87c74f8ec9e3437d2e92c", - "reference": "adda7609e71d5f4dc7b87c74f8ec9e3437d2e92c", + "url": "https://api.github.com/repos/php-stubs/wordpress-stubs/zipball/6105bdab2f26c0204fe90ecc53d5684754550e8f", + "reference": "6105bdab2f26c0204fe90ecc53d5684754550e8f", "shasum": "" }, "require-dev": { + "dealerdirect/phpcodesniffer-composer-installer": "^1.0", "nikic/php-parser": "^4.13", "php": "^7.4 || ~8.0.0", "php-stubs/generator": "^0.8.3", "phpdocumentor/reflection-docblock": "^5.3", - "phpstan/phpstan": "^1.10.12", - "phpunit/phpunit": "^9.5" + "phpstan/phpstan": "^1.10.49", + "phpunit/phpunit": "^9.5", + "szepeviktor/phpcs-psr-12-neutron-hybrid-ruleset": "^0.11" }, "suggest": { "paragonie/sodium_compat": "Pure PHP implementation of libsodium", + "symfony/polyfill-php80": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions", "szepeviktor/phpstan-wordpress": "WordPress extensions for PHPStan" }, "type": "library", @@ -1532,9 +1582,9 @@ ], "support": { "issues": "https://github.com/php-stubs/wordpress-stubs/issues", - "source": "https://github.com/php-stubs/wordpress-stubs/tree/v6.3.0" + "source": "https://github.com/php-stubs/wordpress-stubs/tree/v6.4.3" }, - "time": "2023-08-10T16:34:11+00:00" + "time": "2024-02-11T18:56:19+00:00" }, { "name": "phpcompatibility/php-compatibility", @@ -1710,6 +1760,172 @@ }, "time": "2022-10-24T09:00:36+00:00" }, + { + "name": "phpcsstandards/phpcsextra", + "version": "1.2.1", + "source": { + "type": "git", + "url": "https://github.com/PHPCSStandards/PHPCSExtra.git", + "reference": "11d387c6642b6e4acaf0bd9bf5203b8cca1ec489" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/PHPCSStandards/PHPCSExtra/zipball/11d387c6642b6e4acaf0bd9bf5203b8cca1ec489", + "reference": "11d387c6642b6e4acaf0bd9bf5203b8cca1ec489", + "shasum": "" + }, + "require": { + "php": ">=5.4", + "phpcsstandards/phpcsutils": "^1.0.9", + "squizlabs/php_codesniffer": "^3.8.0" + }, + "require-dev": { + "php-parallel-lint/php-console-highlighter": "^1.0", + "php-parallel-lint/php-parallel-lint": "^1.3.2", + "phpcsstandards/phpcsdevcs": "^1.1.6", + "phpcsstandards/phpcsdevtools": "^1.2.1", + "phpunit/phpunit": "^4.5 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0" + }, + "type": "phpcodesniffer-standard", + "extra": { + "branch-alias": { + "dev-stable": "1.x-dev", + "dev-develop": "1.x-dev" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "LGPL-3.0-or-later" + ], + "authors": [ + { + "name": "Juliette Reinders Folmer", + "homepage": "https://github.com/jrfnl", + "role": "lead" + }, + { + "name": "Contributors", + "homepage": "https://github.com/PHPCSStandards/PHPCSExtra/graphs/contributors" + } + ], + "description": "A collection of sniffs and standards for use with PHP_CodeSniffer.", + "keywords": [ + "PHP_CodeSniffer", + "phpcbf", + "phpcodesniffer-standard", + "phpcs", + "standards", + "static analysis" + ], + "support": { + "issues": "https://github.com/PHPCSStandards/PHPCSExtra/issues", + "security": "https://github.com/PHPCSStandards/PHPCSExtra/security/policy", + "source": "https://github.com/PHPCSStandards/PHPCSExtra" + }, + "funding": [ + { + "url": "https://github.com/PHPCSStandards", + "type": "github" + }, + { + "url": "https://github.com/jrfnl", + "type": "github" + }, + { + "url": "https://opencollective.com/php_codesniffer", + "type": "open_collective" + } + ], + "time": "2023-12-08T16:49:07+00:00" + }, + { + "name": "phpcsstandards/phpcsutils", + "version": "1.0.9", + "source": { + "type": "git", + "url": "https://github.com/PHPCSStandards/PHPCSUtils.git", + "reference": "908247bc65010c7b7541a9551e002db12e9dae70" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/PHPCSStandards/PHPCSUtils/zipball/908247bc65010c7b7541a9551e002db12e9dae70", + "reference": "908247bc65010c7b7541a9551e002db12e9dae70", + "shasum": "" + }, + "require": { + "dealerdirect/phpcodesniffer-composer-installer": "^0.4.1 || ^0.5 || ^0.6.2 || ^0.7 || ^1.0", + "php": ">=5.4", + "squizlabs/php_codesniffer": "^3.8.0 || 4.0.x-dev@dev" + }, + "require-dev": { + "ext-filter": "*", + "php-parallel-lint/php-console-highlighter": "^1.0", + "php-parallel-lint/php-parallel-lint": "^1.3.2", + "phpcsstandards/phpcsdevcs": "^1.1.6", + "yoast/phpunit-polyfills": "^1.1.0 || ^2.0.0" + }, + "type": "phpcodesniffer-standard", + "extra": { + "branch-alias": { + "dev-stable": "1.x-dev", + "dev-develop": "1.x-dev" + } + }, + "autoload": { + "classmap": [ + "PHPCSUtils/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "LGPL-3.0-or-later" + ], + "authors": [ + { + "name": "Juliette Reinders Folmer", + "homepage": "https://github.com/jrfnl", + "role": "lead" + }, + { + "name": "Contributors", + "homepage": "https://github.com/PHPCSStandards/PHPCSUtils/graphs/contributors" + } + ], + "description": "A suite of utility functions for use with PHP_CodeSniffer", + "homepage": "https://phpcsutils.com/", + "keywords": [ + "PHP_CodeSniffer", + "phpcbf", + "phpcodesniffer-standard", + "phpcs", + "phpcs3", + "standards", + "static analysis", + "tokens", + "utility" + ], + "support": { + "docs": "https://phpcsutils.com/", + "issues": "https://github.com/PHPCSStandards/PHPCSUtils/issues", + "security": "https://github.com/PHPCSStandards/PHPCSUtils/security/policy", + "source": "https://github.com/PHPCSStandards/PHPCSUtils" + }, + "funding": [ + { + "url": "https://github.com/PHPCSStandards", + "type": "github" + }, + { + "url": "https://github.com/jrfnl", + "type": "github" + }, + { + "url": "https://opencollective.com/php_codesniffer", + "type": "open_collective" + } + ], + "time": "2023-12-08T14:50:00+00:00" + }, { "name": "phpdocumentor/reflection-common", "version": "2.2.0", @@ -1822,25 +2038,33 @@ }, { "name": "phpdocumentor/type-resolver", - "version": "1.6.1", + "version": "1.8.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "77a32518733312af16a44300404e945338981de3" + "reference": "fad452781b3d774e3337b0c0b245dd8e5a4455fc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/77a32518733312af16a44300404e945338981de3", - "reference": "77a32518733312af16a44300404e945338981de3", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/fad452781b3d774e3337b0c0b245dd8e5a4455fc", + "reference": "fad452781b3d774e3337b0c0b245dd8e5a4455fc", "shasum": "" }, "require": { - "php": "^7.2 || ^8.0", - "phpdocumentor/reflection-common": "^2.0" + "doctrine/deprecations": "^1.0", + "php": "^7.4 || ^8.0", + "phpdocumentor/reflection-common": "^2.0", + "phpstan/phpdoc-parser": "^1.13" }, "require-dev": { "ext-tokenizer": "*", - "psalm/phar": "^4.8" + "phpbench/phpbench": "^1.2", + "phpstan/extension-installer": "^1.1", + "phpstan/phpstan": "^1.8", + "phpstan/phpstan-phpunit": "^1.1", + "phpunit/phpunit": "^9.5", + "rector/rector": "^0.13.9", + "vimeo/psalm": "^4.25" }, "type": "library", "extra": { @@ -1866,29 +2090,76 @@ "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "support": { "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.1" + "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.8.0" }, - "time": "2022-03-15T21:29:03+00:00" + "time": "2024-01-11T11:49:22+00:00" + }, + { + "name": "phpstan/phpdoc-parser", + "version": "1.25.0", + "source": { + "type": "git", + "url": "https://github.com/phpstan/phpdoc-parser.git", + "reference": "bd84b629c8de41aa2ae82c067c955e06f1b00240" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/bd84b629c8de41aa2ae82c067c955e06f1b00240", + "reference": "bd84b629c8de41aa2ae82c067c955e06f1b00240", + "shasum": "" + }, + "require": { + "php": "^7.2 || ^8.0" + }, + "require-dev": { + "doctrine/annotations": "^2.0", + "nikic/php-parser": "^4.15", + "php-parallel-lint/php-parallel-lint": "^1.2", + "phpstan/extension-installer": "^1.0", + "phpstan/phpstan": "^1.5", + "phpstan/phpstan-phpunit": "^1.1", + "phpstan/phpstan-strict-rules": "^1.0", + "phpunit/phpunit": "^9.5", + "symfony/process": "^5.2" + }, + "type": "library", + "autoload": { + "psr-4": { + "PHPStan\\PhpDocParser\\": [ + "src/" + ] + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "PHPDoc parser with support for nullable, intersection and generic types", + "support": { + "issues": "https://github.com/phpstan/phpdoc-parser/issues", + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.25.0" + }, + "time": "2024-01-04T17:06:16+00:00" }, { "name": "phpunit/php-code-coverage", - "version": "9.2.26", + "version": "9.2.30", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "443bc6912c9bd5b409254a40f4b0f4ced7c80ea1" + "reference": "ca2bd87d2f9215904682a9cb9bb37dda98e76089" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/443bc6912c9bd5b409254a40f4b0f4ced7c80ea1", - "reference": "443bc6912c9bd5b409254a40f4b0f4ced7c80ea1", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ca2bd87d2f9215904682a9cb9bb37dda98e76089", + "reference": "ca2bd87d2f9215904682a9cb9bb37dda98e76089", "shasum": "" }, "require": { "ext-dom": "*", "ext-libxml": "*", "ext-xmlwriter": "*", - "nikic/php-parser": "^4.15", + "nikic/php-parser": "^4.18 || ^5.0", "php": ">=7.3", "phpunit/php-file-iterator": "^3.0.3", "phpunit/php-text-template": "^2.0.2", @@ -1937,7 +2208,8 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.26" + "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.30" }, "funding": [ { @@ -1945,7 +2217,7 @@ "type": "github" } ], - "time": "2023-03-06T12:58:08+00:00" + "time": "2023-12-22T06:47:57+00:00" }, { "name": "phpunit/php-file-iterator", @@ -2190,16 +2462,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.6.10", + "version": "9.6.16", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "a6d351645c3fe5a30f5e86be6577d946af65a328" + "reference": "3767b2c56ce02d01e3491046f33466a1ae60a37f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a6d351645c3fe5a30f5e86be6577d946af65a328", - "reference": "a6d351645c3fe5a30f5e86be6577d946af65a328", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3767b2c56ce02d01e3491046f33466a1ae60a37f", + "reference": "3767b2c56ce02d01e3491046f33466a1ae60a37f", "shasum": "" }, "require": { @@ -2214,7 +2486,7 @@ "phar-io/manifest": "^2.0.3", "phar-io/version": "^3.0.2", "php": ">=7.3", - "phpunit/php-code-coverage": "^9.2.13", + "phpunit/php-code-coverage": "^9.2.28", "phpunit/php-file-iterator": "^3.0.5", "phpunit/php-invoker": "^3.1.1", "phpunit/php-text-template": "^2.0.3", @@ -2273,7 +2545,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.10" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.16" }, "funding": [ { @@ -2289,7 +2561,7 @@ "type": "tidelift" } ], - "time": "2023-07-10T04:04:23+00:00" + "time": "2024-01-19T07:03:14+00:00" }, { "name": "psr/log", @@ -2343,16 +2615,16 @@ }, { "name": "sabberworm/php-css-parser", - "version": "8.4.0", + "version": "8.5.0", "source": { "type": "git", - "url": "https://github.com/sabberworm/PHP-CSS-Parser.git", - "reference": "e41d2140031d533348b2192a83f02d8dd8a71d30" + "url": "https://github.com/MyIntervals/PHP-CSS-Parser.git", + "reference": "4e9a54c2a368fcd73ecc6b45f98c7714b54a7db0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sabberworm/PHP-CSS-Parser/zipball/e41d2140031d533348b2192a83f02d8dd8a71d30", - "reference": "e41d2140031d533348b2192a83f02d8dd8a71d30", + "url": "https://api.github.com/repos/MyIntervals/PHP-CSS-Parser/zipball/4e9a54c2a368fcd73ecc6b45f98c7714b54a7db0", + "reference": "4e9a54c2a368fcd73ecc6b45f98c7714b54a7db0", "shasum": "" }, "require": { @@ -2360,13 +2632,18 @@ "php": ">=5.6.20" }, "require-dev": { - "codacy/coverage": "^1.4", - "phpunit/phpunit": "^4.8.36" + "codacy/coverage": "^1.4.3", + "phpunit/phpunit": "^5.7.27" }, "suggest": { "ext-mbstring": "for parsing UTF-8 CSS" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "9.0.x-dev" + } + }, "autoload": { "psr-4": { "Sabberworm\\CSS\\": "src/" @@ -2389,10 +2666,10 @@ "stylesheet" ], "support": { - "issues": "https://github.com/sabberworm/PHP-CSS-Parser/issues", - "source": "https://github.com/sabberworm/PHP-CSS-Parser/tree/8.4.0" + "issues": "https://github.com/MyIntervals/PHP-CSS-Parser/issues", + "source": "https://github.com/MyIntervals/PHP-CSS-Parser/tree/8.5.0" }, - "time": "2021-12-11T13:40:54+00:00" + "time": "2024-02-01T00:40:08+00:00" }, { "name": "sebastian/cli-parser", @@ -2637,20 +2914,20 @@ }, { "name": "sebastian/complexity", - "version": "2.0.2", + "version": "2.0.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/complexity.git", - "reference": "739b35e53379900cc9ac327b2147867b8b6efd88" + "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/739b35e53379900cc9ac327b2147867b8b6efd88", - "reference": "739b35e53379900cc9ac327b2147867b8b6efd88", + "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/25f207c40d62b8b7aa32f5ab026c53561964053a", + "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a", "shasum": "" }, "require": { - "nikic/php-parser": "^4.7", + "nikic/php-parser": "^4.18 || ^5.0", "php": ">=7.3" }, "require-dev": { @@ -2682,7 +2959,7 @@ "homepage": "https://github.com/sebastianbergmann/complexity", "support": { "issues": "https://github.com/sebastianbergmann/complexity/issues", - "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.2" + "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.3" }, "funding": [ { @@ -2690,7 +2967,7 @@ "type": "github" } ], - "time": "2020-10-26T15:52:27+00:00" + "time": "2023-12-22T06:19:30+00:00" }, { "name": "sebastian/diff", @@ -2900,16 +3177,16 @@ }, { "name": "sebastian/global-state", - "version": "5.0.5", + "version": "5.0.6", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2" + "reference": "bde739e7565280bda77be70044ac1047bc007e34" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/0ca8db5a5fc9c8646244e629625ac486fa286bf2", - "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bde739e7565280bda77be70044ac1047bc007e34", + "reference": "bde739e7565280bda77be70044ac1047bc007e34", "shasum": "" }, "require": { @@ -2952,7 +3229,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/global-state/issues", - "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.5" + "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.6" }, "funding": [ { @@ -2960,24 +3237,24 @@ "type": "github" } ], - "time": "2022-02-14T08:28:10+00:00" + "time": "2023-08-02T09:26:13+00:00" }, { "name": "sebastian/lines-of-code", - "version": "1.0.3", + "version": "1.0.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/lines-of-code.git", - "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc" + "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/c1c2e997aa3146983ed888ad08b15470a2e22ecc", - "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc", + "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/e1e4a170560925c26d424b6a03aed157e7dcc5c5", + "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5", "shasum": "" }, "require": { - "nikic/php-parser": "^4.6", + "nikic/php-parser": "^4.18 || ^5.0", "php": ">=7.3" }, "require-dev": { @@ -3009,7 +3286,7 @@ "homepage": "https://github.com/sebastianbergmann/lines-of-code", "support": { "issues": "https://github.com/sebastianbergmann/lines-of-code/issues", - "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.3" + "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.4" }, "funding": [ { @@ -3017,7 +3294,7 @@ "type": "github" } ], - "time": "2020-11-28T06:42:11+00:00" + "time": "2023-12-22T06:20:34+00:00" }, { "name": "sebastian/object-enumerator", @@ -3465,16 +3742,16 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.7.2", + "version": "3.8.1", "source": { "type": "git", - "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "ed8e00df0a83aa96acf703f8c2979ff33341f879" + "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", + "reference": "14f5fff1e64118595db5408e946f3a22c75807f7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/ed8e00df0a83aa96acf703f8c2979ff33341f879", - "reference": "ed8e00df0a83aa96acf703f8c2979ff33341f879", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/14f5fff1e64118595db5408e946f3a22c75807f7", + "reference": "14f5fff1e64118595db5408e946f3a22c75807f7", "shasum": "" }, "require": { @@ -3484,11 +3761,11 @@ "php": ">=5.4.0" }, "require-dev": { - "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0" + "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.3.4" }, "bin": [ - "bin/phpcs", - "bin/phpcbf" + "bin/phpcbf", + "bin/phpcs" ], "type": "library", "extra": { @@ -3503,22 +3780,45 @@ "authors": [ { "name": "Greg Sherwood", - "role": "lead" + "role": "Former lead" + }, + { + "name": "Juliette Reinders Folmer", + "role": "Current lead" + }, + { + "name": "Contributors", + "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer/graphs/contributors" } ], "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.", - "homepage": "https://github.com/squizlabs/PHP_CodeSniffer", + "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer", "keywords": [ "phpcs", "standards", "static analysis" ], "support": { - "issues": "https://github.com/squizlabs/PHP_CodeSniffer/issues", - "source": "https://github.com/squizlabs/PHP_CodeSniffer", - "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki" + "issues": "https://github.com/PHPCSStandards/PHP_CodeSniffer/issues", + "security": "https://github.com/PHPCSStandards/PHP_CodeSniffer/security/policy", + "source": "https://github.com/PHPCSStandards/PHP_CodeSniffer", + "wiki": "https://github.com/PHPCSStandards/PHP_CodeSniffer/wiki" }, - "time": "2023-02-22T23:07:41+00:00" + "funding": [ + { + "url": "https://github.com/PHPCSStandards", + "type": "github" + }, + { + "url": "https://github.com/jrfnl", + "type": "github" + }, + { + "url": "https://opencollective.com/php_codesniffer", + "type": "open_collective" + } + ], + "time": "2024-01-11T20:47:48+00:00" }, { "name": "symfony/console", @@ -3606,16 +3906,16 @@ }, { "name": "symfony/css-selector", - "version": "v5.4.21", + "version": "v5.4.35", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "95f3c7468db1da8cc360b24fa2a26e7cefcb355d" + "reference": "9e615d367e2bed41f633abb383948c96a2dbbfae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/95f3c7468db1da8cc360b24fa2a26e7cefcb355d", - "reference": "95f3c7468db1da8cc360b24fa2a26e7cefcb355d", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/9e615d367e2bed41f633abb383948c96a2dbbfae", + "reference": "9e615d367e2bed41f633abb383948c96a2dbbfae", "shasum": "" }, "require": { @@ -3652,7 +3952,7 @@ "description": "Converts CSS selectors to XPath expressions", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/css-selector/tree/v5.4.21" + "source": "https://github.com/symfony/css-selector/tree/v5.4.35" }, "funding": [ { @@ -3668,7 +3968,7 @@ "type": "tidelift" } ], - "time": "2023-02-14T08:03:56+00:00" + "time": "2024-01-23T13:51:25+00:00" }, { "name": "symfony/debug", @@ -3866,16 +4166,16 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.27.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "5bbc823adecdae860bb64756d639ecfec17b050a" + "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/5bbc823adecdae860bb64756d639ecfec17b050a", - "reference": "5bbc823adecdae860bb64756d639ecfec17b050a", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ef4d7e442ca910c4764bce785146269b30cb5fc4", + "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4", "shasum": "" }, "require": { @@ -3889,9 +4189,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.27-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -3928,7 +4225,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.29.0" }, "funding": [ { @@ -3944,20 +4241,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.27.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534" + "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/8ad114f6b39e2c98a8b0e3bd907732c207c2b534", - "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9773676c8a1bb1f8d4340a62efe641cf76eda7ec", + "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec", "shasum": "" }, "require": { @@ -3971,9 +4268,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.27-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -4011,7 +4305,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.29.0" }, "funding": [ { @@ -4027,7 +4321,7 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "symfony/polyfill-php80", @@ -4110,16 +4404,16 @@ }, { "name": "symfony/process", - "version": "v5.4.24", + "version": "v5.4.35", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "e3c46cc5689c8782944274bb30702106ecbe3b64" + "reference": "cbc28e34015ad50166fc2f9c8962d28d0fe861eb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/e3c46cc5689c8782944274bb30702106ecbe3b64", - "reference": "e3c46cc5689c8782944274bb30702106ecbe3b64", + "url": "https://api.github.com/repos/symfony/process/zipball/cbc28e34015ad50166fc2f9c8962d28d0fe861eb", + "reference": "cbc28e34015ad50166fc2f9c8962d28d0fe861eb", "shasum": "" }, "require": { @@ -4152,7 +4446,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v5.4.24" + "source": "https://github.com/symfony/process/tree/v5.4.35" }, "funding": [ { @@ -4168,20 +4462,20 @@ "type": "tidelift" } ], - "time": "2023-05-17T11:26:05+00:00" + "time": "2024-01-23T13:51:25+00:00" }, { "name": "theseer/tokenizer", - "version": "1.2.1", + "version": "1.2.2", "source": { "type": "git", "url": "https://github.com/theseer/tokenizer.git", - "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e" + "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theseer/tokenizer/zipball/34a41e998c2183e22995f158c581e7b5e755ab9e", - "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/b2ad5003ca10d4ee50a12da31de12a5774ba6b96", + "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96", "shasum": "" }, "require": { @@ -4210,7 +4504,7 @@ "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", "support": { "issues": "https://github.com/theseer/tokenizer/issues", - "source": "https://github.com/theseer/tokenizer/tree/1.2.1" + "source": "https://github.com/theseer/tokenizer/tree/1.2.2" }, "funding": [ { @@ -4218,7 +4512,7 @@ "type": "github" } ], - "time": "2021-07-28T10:34:58+00:00" + "time": "2023-11-20T00:12:19+00:00" }, { "name": "vimeo/psalm", @@ -4492,30 +4786,38 @@ }, { "name": "wp-coding-standards/wpcs", - "version": "2.3.0", + "version": "3.0.1", "source": { "type": "git", "url": "https://github.com/WordPress/WordPress-Coding-Standards.git", - "reference": "7da1894633f168fe244afc6de00d141f27517b62" + "reference": "b4caf9689f1a0e4a4c632679a44e638c1c67aff1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/WordPress/WordPress-Coding-Standards/zipball/7da1894633f168fe244afc6de00d141f27517b62", - "reference": "7da1894633f168fe244afc6de00d141f27517b62", + "url": "https://api.github.com/repos/WordPress/WordPress-Coding-Standards/zipball/b4caf9689f1a0e4a4c632679a44e638c1c67aff1", + "reference": "b4caf9689f1a0e4a4c632679a44e638c1c67aff1", "shasum": "" }, "require": { + "ext-filter": "*", + "ext-libxml": "*", + "ext-tokenizer": "*", + "ext-xmlreader": "*", "php": ">=5.4", - "squizlabs/php_codesniffer": "^3.3.1" + "phpcsstandards/phpcsextra": "^1.1.0", + "phpcsstandards/phpcsutils": "^1.0.8", + "squizlabs/php_codesniffer": "^3.7.2" }, "require-dev": { - "dealerdirect/phpcodesniffer-composer-installer": "^0.5 || ^0.6", + "php-parallel-lint/php-console-highlighter": "^1.0.0", + "php-parallel-lint/php-parallel-lint": "^1.3.2", "phpcompatibility/php-compatibility": "^9.0", - "phpcsstandards/phpcsdevtools": "^1.0", + "phpcsstandards/phpcsdevtools": "^1.2.0", "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0" }, "suggest": { - "dealerdirect/phpcodesniffer-composer-installer": "^0.6 || This Composer plugin will sort out the PHPCS 'installed_paths' automatically." + "ext-iconv": "For improved results", + "ext-mbstring": "For improved results" }, "type": "phpcodesniffer-standard", "notification-url": "https://packagist.org/downloads/", @@ -4532,6 +4834,7 @@ "keywords": [ "phpcs", "standards", + "static analysis", "wordpress" ], "support": { @@ -4539,7 +4842,13 @@ "source": "https://github.com/WordPress/WordPress-Coding-Standards", "wiki": "https://github.com/WordPress/WordPress-Coding-Standards/wiki" }, - "time": "2020-05-13T23:57:56+00:00" + "funding": [ + { + "url": "https://opencollective.com/thewpcc/contribute/wp-php-63406", + "type": "custom" + } + ], + "time": "2023-09-14T07:06:09+00:00" }, { "name": "yoast/phpunit-polyfills", @@ -4609,10 +4918,10 @@ "prefer-lowest": false, "platform": [], "platform-dev": { - "php": "^7.3 || ^8" + "php": "^7.4 || ^8" }, "platform-overrides": { - "php": "7.3" + "php": "7.4" }, - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.6.0" } diff --git a/config/psalm/psalm-baseline.xml b/config/psalm/psalm-baseline.xml index 472edad268..118f2fcd1f 100644 --- a/config/psalm/psalm-baseline.xml +++ b/config/psalm/psalm-baseline.xml @@ -112,14 +112,6 @@ wp_unslash( $_GET['course_id'] ?? 0 ) wp_unslash( $_GET['lesson_id'] ?? 0 ) - - $course->post_author - $post->post_author - $post->post_author - - - $post->post_author - isset( $this->bulk_actions_controller ) && $this->bulk_actions_controller->is_current_page() @@ -168,10 +160,9 @@ $this->total_items - + $course->ID $course->post_title - $course->post_title $controller->get_name() @@ -457,14 +448,6 @@ isset( $this->local_plugin_updates ) - - - $post->post_title - - - $post->post_title - - require_once ABSPATH . 'wp-admin/includes/plugin.php' @@ -490,22 +473,11 @@ $results - - $course - $course - get_provider_results get_time get_version_hash - - $course_progress->comment_approved - $course_progress->comment_date_gmt - - - $course_progress->comment_approved - debug @@ -518,11 +490,6 @@ \WP_Term[] - - - $course - - $courses @@ -702,9 +669,6 @@ get_permalink() - - $lesson->ID - @@ -724,9 +688,6 @@ - - get_post() - $post_type_object @@ -809,11 +770,6 @@ get_post_type_archive_link( 'sensei_message' ) - - - $lesson->ID - - $post_type_object @@ -828,12 +784,6 @@ $course_id - - - $lesson->ID - $lesson->ID - - $block_parent['blockName'] @@ -852,9 +802,6 @@ get_permalink() - - $lesson->ID - @@ -968,12 +915,6 @@ array - - $new_post - - - object - $course_id $old_quiz_id @@ -1001,25 +942,17 @@ $lesson_order_page_slug Sensei()->plugin_url - - $new_post + null - + $data $data - $post - get_post( $old_quiz_id ) - - $course->ID + $course->ID $course->ID - $course->post_status - $course->post_title $post->ID - $post->post_type - $post->post_type $course_structure @@ -1029,9 +962,7 @@ $post_type->cap->edit_posts $screen - - $post->post_type - $post->post_type + $post_type->cap $post_type->labels $screen->id @@ -1040,9 +971,8 @@ $_GET['post'] $_REQUEST['event_name'] - + ! is_wp_error( $new_post_id ) - ! is_wp_error( $post ) $new_post $new_post $num_posts @@ -1081,15 +1011,6 @@ $search $search - - $course->post_title - - - $course->post_title - - - $course->post_title - $user_email @@ -1134,15 +1055,6 @@ $search $search - - $lesson->post_title - - - $lesson->post_title - - - $lesson->post_title - Sensei_Analysis_Lesson_List_Table Sensei_Analysis_Lesson_List_Table @@ -1339,13 +1251,7 @@ $title - - $course->post_name - $course->post_name - - - $course->post_name - $course->post_name + $course->post_title @@ -1357,11 +1263,12 @@ - + $args $changed_args $post_args $post_args + $post_args is_wp_error( $modules ) @@ -1370,12 +1277,6 @@ $existing_module - - $post_args - - - false|int - $existing_module $lessons_query instanceof WP_Query ? $lessons_query->posts : [] @@ -1388,59 +1289,32 @@ bool|WP_Error false|array[] - - $author + $course_name - $teacher_user_id - get_post( $this->course_id )->post_author - - $lesson->ID + $term->term_id $structure - - $lesson - - + $existing_module->term_id - $lesson->ID - $lesson->ID - $lesson->post_status - $lesson->post_status - $lesson->post_title - $lesson->post_title - $lesson->post_type $previous_term->term_id $term->description $term->name $term->slug $term->slug $term->term_id - get_post( $this->course_id )->post_author - get_post( $this->course_id )->post_author - get_post( $this->course_id )->post_author - + $item['id'] - $lesson->ID - $lesson->ID - - $lesson->ID - $lesson->ID - $lesson->post_status - $lesson->post_title - $lesson->post_title + $term->description $term->name $term->slug $term->term_id - get_post( $this->course_id )->post_author - get_post( $this->course_id )->post_author - get_post( $this->course_id )->post_author $lessons_query instanceof WP_Query @@ -1450,7 +1324,9 @@ $lesson $modules - + + $existing_module->term_id + $previous_term->term_id $term->description $term->name $term->slug @@ -1525,9 +1401,7 @@ int string - - $course->post_author - $course->post_author + $course_id $course_id $i @@ -1587,18 +1461,13 @@ get_the_ID() get_the_ID() - + $category_output $category_output $category_output - $course $output - - $course->ID - $course->ID - $course->post_author - $course->post_content + $course_item->ID $course_item->ID $course_item->post_author @@ -1609,43 +1478,23 @@ $course_item->post_title $lesson->ID $post->ID - $post->post_content - $post->post_name $post->post_type $post_item->ID $post_item->post_title - $sensei_settings_course_page->post_content $taxonomy_raw_obj->labels $user_info->display_name $user_info->display_name - get_post( $course_id )->post_author - get_post( get_the_ID() )->post_excerpt - - $course->ID - $course->ID - $course->ID - $course->ID - $course->ID - $course->ID - $course->ID + $post_type->cap->edit_post $screen - $sensei_settings_course_page->post_content get_edit_post_link( $post_item->ID ) get_edit_post_link( absint( $course_prerequisite_id ) ) get_post_type_object( 'course' )->cap->edit_post - - $course->ID - $course->ID - $course->post_author - $course->post_content + $post_type->cap - $sensei_settings_course_page->post_content $term->term_id - get_post( $course_id )->post_author - get_post( get_the_ID() )->post_excerpt get_post_type_object( 'course' )->cap @@ -2013,12 +1862,10 @@ - + ! self::$instance empty( self::$learner_terms[ $user_id ] ) || self::$learner_terms[ $user_id ] instanceof WP_Error - empty( self::$learner_terms[ $user_id ] ) || self::$learner_terms[ $user_id ] instanceof WP_Error self::$instance - self::$learner_terms[ $user_id ] instanceof WP_Error self::$learner_terms @@ -2036,16 +1883,16 @@ - + $post_type_args $post_type_args + $qargs $questions_array 'WP_Post' 'WP_User' - + ! isset( $lesson_id ) - ! isset( $question->ID ) - 1 !== $new_course -1 -1 !== $new_complexity @@ -2054,13 +1901,12 @@ empty( $block['innerBlocks'][0]['attrs']['id'] ) ? null : wp_get_attachment_url( get_post_thumbnail_id( $block['innerBlocks'][0]['attrs']['id'] ) ) get_permalink( $quiz_id ) - + $args $post_args $post_args $post_type_args $post_type_args - $qargs 'question-category' @@ -2085,7 +1931,7 @@ int|null - + $course_id $course_id $course_id @@ -2100,7 +1946,6 @@ $question_id $question_id $question_id - $quiz_author $quiz_id $quiz_id $quiz_id @@ -2190,10 +2035,7 @@ get_the_ID() get_the_ID() - - $lesson - $lesson_prerequisite_post - get_post( get_the_ID() ) + get_the_term_list( $question_id, 'question-category', '', ', ', '' ) @@ -2201,41 +2043,21 @@ $question_cats $question_cats - - $attachment->post_title + $cat->count $cat->count $cat->name $cat_question->ID $lesson->ID - $lesson->ID - $lesson->post_content - $lesson->post_status - $lesson->post_title - $post->post_content - $post->post_content $question->ID - $question->ID - $question->post_content - $question->post_title - $question->post_title $question_cat->name $user_info->display_name - get_post( $quiz_id )->post_author - get_post()->post_author - get_post()->post_author - + $cat->name $edit_course_url - $lesson->post_status - $lesson->post_title $lesson_id - $post->post_content $post_type->cap->edit_post - $question->post_content - $question->post_title - $question->post_title $quiz_id get_edit_post_link( absint( $lesson_course_id ) ) get_edit_post_link( absint( $lesson_prerequisite_id ) ) @@ -2245,21 +2067,11 @@ get_post_type_object( 'question' )->cap->edit_post get_post_type_object( 'question' )->cap->edit_post - - $attachment->post_title + $cat->name - $lesson->post_status - $lesson->post_title - $post->post_content $post_type->cap - $question->post_content - $question->post_title - $question->post_title $question_cat->name $screen->base - get_post( $quiz_id )->post_author - get_post()->post_author - get_post()->post_author get_post_type_object( 'course' )->cap get_post_type_object( 'lesson' )->cap get_post_type_object( 'question' )->cap @@ -2336,9 +2148,6 @@ $message_data - - is_wp_error( $post ) - public function message_login() { public function stop_wp_comment_emails( $emails, $comment_id ) { @@ -2352,14 +2161,10 @@ string - + $comment->comment_ID $comment->comment_post_ID - $comment->comment_post_ID $comment->user_id - $comment->user_id - $post->ID - $post->post_author $post_id @@ -2386,45 +2191,16 @@ get_the_date() get_the_permalink( $message_post_id ) - - $comment->comment_post_ID - $comment->comment_post_ID - $comment->user_id + $comment_author->user_login $comment_author->user_login - $course->post_title - $message->ID - $message->ID - $message->post_type - $message->post_type - $message_post->ID - $message_post->post_type - $post->ID - $post->ID - $post->post_author - $post->post_type $receiver->user_login $sender->display_name $sender->user_login - - $message->ID - $message->ID - $message->ID - $message->ID + $post_id - - $course->post_title - $message->ID - $message->ID - $message->post_type - $message->post_type - $post->ID - $post->ID - $post->post_author - $post->post_type - $description $label @@ -2474,8 +2250,7 @@ WP_Query integer - - $course->post_author + $course_id $course_id $possible_user_id @@ -2529,52 +2304,43 @@ get_permalink( $course_id ) get_permalink( $course_id ) - + $module - $post - get_post( (int) $_GET['lesson_id'] ) $terms - + $course->ID $course->ID $course->ID - $course->post_author $course->post_title $course->post_title $module->parent $module->slug - $post->post_type $slug->errors $taxonomy->cap $taxonomy->labels $term->slug $term->term_id $term->term_id - get_post( $post_ID )->post_type - + $module->description $module->slug $module->term_id $module_id - $post->post_type $post_type->cap->edit_post - - $course->post_author + $module->description $module->parent $module->slug $module->term_id $module->term_id $module->term_id - $post->post_type $post_type->cap $term->slug - get_post( $post_ID )->post_type get_queried_object()->name @@ -2615,13 +2381,15 @@ $modules $slug - + $module->parent $module->slug $module->term_id $module->term_id $module->term_id $term->slug + $term->term_id + $term->term_id @@ -2631,9 +2399,6 @@ $notices - - get_post() - @@ -2648,8 +2413,7 @@ global $pagenow; - - $post->ID + $post->ID $post->ID $post_id @@ -2669,10 +2433,6 @@ get_permalink( $post_ID ) wp_post_revision_title( (int) $_GET['revision'], false ) - - $post->ID - $post->post_type - get_queried_object()->ID @@ -2817,34 +2577,17 @@ $cats - - $attachment->post_content - $attachment->post_title - $question->ID - $question->post_content - $question->post_type - $quiz->post_author - $quiz->post_type + $user_lesson_status->comment_approved - get_post( $question_id )->post_content - - $question_description - $question_description - $question_media_title - $question_media_title - - - $attachment->post_content - $attachment->post_title - $question->post_content - get_post( $question_id )->post_content - $is_quiz_graded + + $my_post + $this->file @@ -2855,9 +2598,6 @@ 0 empty( $lesson_id ) || empty( $user_id ) || ! is_array( $quiz_answers ) - - $my_post - public function reset_button_click_listener() { @@ -2938,23 +2678,10 @@ get_permalink( $lesson_id ) get_the_ID() - + $quiz - get_post() - - $lesson->ID - $lesson->post_author - $lesson->post_name - $question->post_content - $quiz->post_parent - $saved_lesson->post_author - $saved_lesson->post_name - $saved_lesson->post_title - - - $lesson->ID - $question->post_content + $quiz_id $quiz_id $quiz_id @@ -2964,14 +2691,6 @@ $quiz_id $quiz_id - - $lesson->ID - $lesson->post_name - $question->post_content - $saved_lesson->post_author - $saved_lesson->post_name - $saved_lesson->post_title - ! is_wp_error( $grade ) is_countable( $all_questions ) @@ -3050,8 +2769,9 @@ - + $args + $post_updates $user 'WP_Role' 'WP_Role' @@ -3069,9 +2789,6 @@ ! is_array( $lessons ) is_numeric( $comments ) - - $post_updates - $course_id $lesson_id @@ -3079,14 +2796,11 @@ bool - - $activity_comments->user_id - - $course->post_author $course_id $course_id $module_course->post_author + $term_id public function teacher_filter_query_modify( $query ) { @@ -3125,44 +2839,24 @@ empty( $course_id ) || ! $course_id empty( $lesson_id ) || ! $lesson_id - + $author->display_name - $course->post_author - $course->post_author - $course->post_author - $course->post_author - $course->post_title $existing_module_by_slug->term_id - $lesson->ID $module_course->ID $module_course->post_author $module_course->post_title - $post->ID - $post->post_author $term->slug - $user->ID $user->roles - - $course->post_author - $lesson->ID + $term->slug - - $course->post_author - $course->post_author - $course->post_author - $course->post_author - $course->post_title - $lesson->ID - $post->ID - $post->post_author + $screen->id $term->slug - + ! empty( $course_lessons ) && is_array( $course_lessons ) - ! is_wp_error( $search_term ) is_array( $course_lessons ) isset( $screen->id ) @@ -3176,7 +2870,8 @@ $new_term - + + $existing_module_by_slug->term_id $term->slug @@ -3214,19 +2909,6 @@ get_permalink( $post->ID ) - - $post->ID - $post->post_title - $post->post_type - - - $post->ID - - - $post->ID - $post->post_title - $post->post_type - $args && is_array( $args ) is_array( $args ) @@ -3478,15 +3160,10 @@ get_permalink( $quiz_id ) get_permalink( $quiz_id ) - - $post - - + $plugin_information->name $plugin_information->short_description $plugin_information->version - $post->ID - $post->post_content get_userdata( $user_id )->user_login get_userdata( $user_id )->user_login @@ -3719,10 +3396,6 @@ $post - - $post->ID - $post->post_type - @@ -3959,10 +3632,6 @@ get_the_ID() get_the_ID() - - $post - $post - @@ -3993,9 +3662,6 @@ $second_type_order_exists ? array_search( $second_log[2]['type'], $log_order, true ) : null $uploads['error'] - - $file->post_title - $first_type_order_exists ? array_search( $first_log[2]['type'], $log_order, true ) : null $second_type_order_exists ? array_search( $second_log[2]['type'], $log_order, true ) : null @@ -4128,6 +3794,9 @@ $term_arr + + $module->term_id + @@ -4235,17 +3904,6 @@ get_term( $module_term_id )->name - - - $file->post_title - - - $file->post_title - - - $file->post_title - - wp_get_attachment_image_url( $attachment, 'full' ) @@ -4626,12 +4284,6 @@ $teacher $template - - $course->post_title - - - $course->post_title - @@ -4646,16 +4298,12 @@ $teacher $template - + $this->learner->ID $this->learner->display_name - $this->message->post_content $this->teacher->ID $this->teacher->user_email - - $this->message->post_content - @@ -4737,8 +4385,9 @@ $is_enrolled - + $learner_terms + $object_ids get_version_hash @@ -4918,12 +4567,6 @@ - - get_post( $post_id ) - - - WP_Post|null - get_the_ID() @@ -4991,25 +4634,6 @@ \Sensei_Course::get_course_completed_page_url( $course_id ) - - - $course->post_author - - - $course->post_author - - - $course->post_author - - - - - $course->ID - $course->post_author - $course->post_status - $course->post_title - - $course_id @@ -5019,10 +4643,6 @@ get_permalink( $quiz_id ) - - $course->ID - $lesson->ID - @@ -5035,15 +4655,12 @@ - + $lesson_id - $teacher_id - + $message_receiver_user->ID $message_sender_user->ID - $post->post_author - $post->post_type $teacher->ID $teacher->display_name get_userdata( $recipient_id )->user_email @@ -5053,54 +4670,22 @@ get_permalink( absint( $message_id ) ) - - $course->ID - $message->ID - $message->post_content - $message->post_title - - - $course->ID - $message->ID - $message->post_content - $message->post_title - - - $course->ID - $message->ID - $message->post_content - $message->post_title - - - - - $course->post_author - $course->post_status - $course->post_title - $course_id $lesson_id - - $course->ID - $lesson->ID - ! is_wp_error( $grade ) - + $comment->user_id - $teacher_id - + $commenter->display_name - $course->ID - $course->post_author get_userdata( $teacher_id )->user_email @@ -5134,6 +4719,7 @@ + $grade_rows @@ -5153,6 +4739,7 @@ + $row->created_at $row->final_grade @@ -5168,15 +4755,24 @@ - + + + $row->completed_at $row->completed_at $row->created_at + $row->created_at + $row->id $row->id $row->post_id + $row->post_id + $row->started_at $row->started_at $row->status + $row->status + $row->updated_at $row->updated_at $row->user_id + $row->user_id @@ -5185,15 +4781,24 @@ - + + + $row->completed_at $row->completed_at $row->created_at + $row->created_at + $row->id $row->id $row->post_id + $row->post_id + $row->started_at $row->started_at $row->status + $row->status + $row->updated_at $row->updated_at $row->user_id + $row->user_id @@ -5215,15 +4820,24 @@ - + + + $row->completed_at $row->completed_at $row->created_at + $row->created_at + $row->id $row->id $row->post_id + $row->post_id + $row->started_at $row->started_at $row->status + $row->status + $row->updated_at $row->updated_at $row->user_id + $row->user_id @@ -5285,13 +4899,6 @@ $timestamp - - $post->post_excerpt - $post->post_title - $post->post_title - $post->post_type - $post->post_type - $mail_poet_lists $sensei_lists @@ -5348,12 +4955,6 @@ - - $post->post_content - - - $post->post_content - $global_pages_ref $global_post_ref @@ -5466,9 +5067,6 @@ $result[ $student_id ][ $course_id ] $result[ $student_id ][ $course_id ] - - $course->post_type - $edit_course_cap @@ -5480,12 +5078,6 @@ - - $course ? $course : null - - - WP_Post|null - get_error_code get_error_message @@ -5515,9 +5107,6 @@ $result[ $user_id ][ $course_id ] $result[ $user_id ][ $course_id ] - - $course->post_type - $edit_course_cap @@ -5539,19 +5128,14 @@ boolean - - $post->post_type - - - $post->post_type + $post_id $post_id $post_type->cap->edit_post $teacher $teacher - - $post->post_type + $post_type->cap @@ -5670,10 +5254,10 @@ + is_wp_error( $quiz_id ) - $question_id $quiz_id @@ -5681,40 +5265,18 @@ WP_REST_Response|WP_Error - - $lesson - $lesson - $lesson + $question - get_post( $quiz ) - get_post( $quiz_id ) get_error_code get_error_data - - $lesson->ID - $lesson->ID - $lesson->ID - $lesson->ID - $lesson->post_status - $lesson->post_title - $lesson->post_type - $lesson->post_type - - - $lesson->ID - $lesson->ID - $lesson->ID + get_post_type_object( 'lesson' )->cap->edit_post get_post_type_object( 'lesson' )->cap->edit_post - - $lesson->ID - $lesson->ID - $lesson->post_status - $lesson->post_title + get_post_type_object( 'lesson' )->cap get_post_type_object( 'lesson' )->cap @@ -5734,15 +5296,6 @@ $prepared - - $post->ID - - - $post->ID - - - $post->ID - Sensei_REST_API_Lessons_Controller Sensei_REST_API_Lessons_Controller @@ -5755,6 +5308,9 @@ empty( $current_user ) + + true|WP_Error + $object $object @@ -5794,22 +5350,17 @@ $attachment_src[0] - - $attachment->ID - $attachment->post_title + $question_category->name $question_category->term_id - - $attachment->post_title + $question_id get_post_type_object( 'multiple_question' )->cap->edit_post get_post_type_object( 'question' )->cap->edit_post get_post_type_object( 'question' )->cap->edit_post - - $attachment->ID - $attachment->post_title + get_post_type_object( 'multiple_question' )->cap get_post_type_object( 'question' )->cap get_post_type_object( 'question' )->cap @@ -5824,15 +5375,10 @@ - - $question - $question + $question_post $question_post - - $question->post_type - Sensei_REST_API_Question_Options_Controller @@ -5851,29 +5397,25 @@ $question_id - + WP_Error|WP_Post|WP_REST_Response + true|WP_Error $object - + $post $question_id - get_post( $question_id ) get_error_code - - $question->post_author - $post_type->cap->edit_posts - + $post_type->cap - $question->post_author Sensei_REST_API_Questions_Controller @@ -5894,9 +5436,6 @@ - - is_wp_error( $post ) - $fail_response $fail_response @@ -5906,33 +5445,13 @@ boolean string - - $post->ID - $post->post_author + \Sensei()->lesson->get_course_id( $post->ID ) \Sensei()->quiz->get_lesson_id( $post->ID ) - - $post->ID - $post->ID - $post->ID - $post->ID - $post->post_author - $post->post_type - - + $message - $post->ID - $post->ID - - $post->ID - $post->ID - $post->ID - $post->ID - $post->post_author - $post->post_type - Sensei_REST_API_Send_Message_Controller @@ -5995,13 +5514,6 @@ get_the_ID() get_the_ID() - - $page->ID - get_post( $course_id )->post_author - - - get_post( $course_id )->post_author - Jetpack @@ -6028,6 +5540,9 @@ $term->term_id + + $term->term_id + @@ -6141,10 +5656,9 @@ $course_status $user_id - + $category_output $course - get_post( $course_id ) $query @@ -6204,9 +5718,8 @@ get_permalink( $course_id ) - + $item - get_post( $lesson_id ) $lesson_id @@ -6301,9 +5814,6 @@ $post_to_copy - - $course - $module->name @@ -6365,11 +5875,6 @@ (int) $offset - - - $email_address - - global $woothemes_sensei; @@ -6379,8 +5884,10 @@ - - function get_objects_in_term($term_ids, $taxonomies, $args = array()) + + function get_category($category, $output = \OBJECT, $filter = 'raw') + function get_comment($comment = \null, $output = \OBJECT) + function get_post($post = \null, $output = \OBJECT, $filter = 'raw') function wp_remote_request($url, $args = array()) diff --git a/includes/admin/class-sensei-plugins-installation.php b/includes/admin/class-sensei-plugins-installation.php index 0fbff2d6fa..55011d94be 100644 --- a/includes/admin/class-sensei-plugins-installation.php +++ b/includes/admin/class-sensei-plugins-installation.php @@ -273,7 +273,7 @@ private function save_error( $slug, $message ) { /** * Complete installation removing the plugin from the transient. * - * @param string $slug + * @param string $slug Plugin slug. */ private function complete_installation( $slug ) { $installing_plugins = $this->get_installing_plugins(); @@ -281,7 +281,7 @@ private function complete_installation( $slug ) { if ( ! empty( $installing_plugins ) ) { $installing_plugins = array_filter( $installing_plugins, - function( $plugin ) use ( $slug ) { + function ( $plugin ) use ( $slug ) { return $plugin->product_slug !== $slug; } ); @@ -298,7 +298,7 @@ function( $plugin ) use ( $slug ) { /** * Wrapper to get error message and give the `get_error_data` as fallback. * - * @param WP_Error $error + * @param WP_Error $error Error object. * * @return string Error message. */ @@ -424,7 +424,7 @@ public function install_plugin( $plugin_slug ) { ); if ( is_wp_error( $plugin_information ) ) { - throw new Exception( $this->get_error_message( $plugin_information ) ); + throw new Exception( esc_html( $this->get_error_message( $plugin_information ) ) ); } // Suppress feedback. @@ -434,13 +434,13 @@ public function install_plugin( $plugin_slug ) { $download = $upgrader->download_package( $package ); if ( is_wp_error( $download ) ) { - throw new Exception( $this->get_error_message( $download ) ); + throw new Exception( esc_html( $this->get_error_message( $download ) ) ); } $working_dir = $upgrader->unpack_package( $download, true ); if ( is_wp_error( $working_dir ) ) { - throw new Exception( $this->get_error_message( $working_dir ) ); + throw new Exception( esc_html( $this->get_error_message( $working_dir ) ) ); } $result = $upgrader->install_package( @@ -461,7 +461,7 @@ public function install_plugin( $plugin_slug ) { ob_end_clean(); if ( is_wp_error( $result ) ) { - throw new Exception( $this->get_error_message( $result ) ); + throw new Exception( esc_html( $this->get_error_message( $result ) ) ); } } @@ -481,7 +481,7 @@ public function activate_plugin( $plugin_slug, $plugin_file ) { $result = activate_plugin( $plugin_file ); if ( is_wp_error( $result ) ) { - throw new Exception( $this->get_error_message( $result ) ); + throw new Exception( esc_html( $this->get_error_message( $result ) ) ); } } } diff --git a/includes/class-sensei-analysis-overview-list-table.php b/includes/class-sensei-analysis-overview-list-table.php index 0d362cf20d..128c35fe5a 100755 --- a/includes/class-sensei-analysis-overview-list-table.php +++ b/includes/class-sensei-analysis-overview-list-table.php @@ -288,7 +288,7 @@ public function prepare_items() { $order = 'ASC'; // phpcs:ignore WordPress.Security.NonceVerification if ( ! empty( $_GET['order'] ) ) { - // phpcs:ignore WordPress.Security.NonceVerification,WordPress.PHP.StrictComparisons.LooseComparison,WordPress.Security.ValidatedSanitizedInput.MissingUnslash,WordPress.Security.ValidatedSanitizedInput.InputNotSanitized + // phpcs:ignore WordPress.Security.NonceVerification,Universal.Operators.StrictComparisons.LooseComparison,WordPress.Security.ValidatedSanitizedInput.MissingUnslash,WordPress.Security.ValidatedSanitizedInput.InputNotSanitized $order = ( 'ASC' == strtoupper( $_GET['order'] ) ) ? 'ASC' : 'DESC'; } @@ -375,7 +375,7 @@ public function generate_report( $report ) { $order = 'ASC'; //phpcs:ignore WordPress.Security.NonceVerification.Recommended if ( ! empty( $_GET['order'] ) ) { - // phpcs:ignore WordPress.Security.NonceVerification,WordPress.PHP.StrictComparisons.LooseComparison,WordPress.Security.NonceVerification.Recommended,WordPress.Security.ValidatedSanitizedInput.MissingUnslash,WordPress.Security.ValidatedSanitizedInput.InputNotSanitized + // phpcs:ignore WordPress.Security.NonceVerification,Universal.Operators.StrictComparisons.LooseComparison,WordPress.Security.NonceVerification.Recommended,WordPress.Security.ValidatedSanitizedInput.MissingUnslash,WordPress.Security.ValidatedSanitizedInput.InputNotSanitized $order = ( 'ASC' == strtoupper( $_GET['order'] ) ) ? 'ASC' : 'DESC'; } diff --git a/includes/class-sensei-settings.php b/includes/class-sensei-settings.php index 231f3bbffc..829e9790e8 100755 --- a/includes/class-sensei-settings.php +++ b/includes/class-sensei-settings.php @@ -1016,7 +1016,7 @@ public function log_settings_update( $old_value, $value ) { $old_field_value = isset( $old_value[ $field ] ) ? $old_value[ $field ] : ''; $new_field_value = isset( $value[ $field ] ) ? $value[ $field ] : ''; - // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison -- Loose comparison is okay for checking for changes. + // phpcs:ignore Universal.Operators.StrictComparisons -- Loose comparison is okay for checking for changes. if ( $new_field_value != $old_field_value ) { // Create an array for this section of settings if needed. $section = $field_config['section']; diff --git a/includes/internal/migration/validations/class-progress-validation.php b/includes/internal/migration/validations/class-progress-validation.php index c3a0093bb9..c8c3373830 100644 --- a/includes/internal/migration/validations/class-progress-validation.php +++ b/includes/internal/migration/validations/class-progress-validation.php @@ -326,7 +326,7 @@ private function validate_quiz_progress( int $quiz_id ): void { * @param object $tables_based_progress Tables based progress. */ private function compare_progress( object $comments_based_progress, object $tables_based_progress ): void { - // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison -- Intended. + // phpcs:ignore Universal.Operators.StrictComparisons.LooseComparison -- Intended. if ( $this->get_progress_data( $comments_based_progress ) != $this->get_progress_data( $tables_based_progress ) ) { $this->add_mismatch_error( $comments_based_progress, $tables_based_progress ); } diff --git a/includes/internal/migration/validations/class-quiz-submission-validation.php b/includes/internal/migration/validations/class-quiz-submission-validation.php index e1059fed21..c48da366a8 100644 --- a/includes/internal/migration/validations/class-quiz-submission-validation.php +++ b/includes/internal/migration/validations/class-quiz-submission-validation.php @@ -182,7 +182,7 @@ private function validate_quiz_submissions( int $quiz_id ): void { * @param Submission_Interface $tables_based_submission Tables based progress. */ private function compare_submission( Submission_Interface $comments_based_submission, Submission_Interface $tables_based_submission ): void { - // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison -- Intended. + // phpcs:ignore Universal.Operators.StrictComparisons.LooseComparison -- Intended. if ( $this->get_submission_data( $comments_based_submission ) != $this->get_submission_data( $tables_based_submission ) ) { $this->add_mismatch_submission_error( $comments_based_submission, $tables_based_submission ); } @@ -261,7 +261,7 @@ function( array $answers, Answer_Interface $answer ) { $common_keys = array_intersect( $comments_based_keys, $tables_based_keys ); foreach ( $common_keys as $question_id ) { - // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison -- Intended. + // phpcs:ignore Universal.Operators.StrictComparisons.LooseComparison -- Intended. if ( $comments_based_answers[ $question_id ]['value'] != $tables_based_answers[ $question_id ]['value'] ) { $this->add_error( 'Answers mismatch.', @@ -356,7 +356,7 @@ function( array $grades, Grade_Interface $grade ) { 'points' => $tables_based_grades[ $question_id ]['points'], 'feedback' => $tables_based_grades[ $question_id ]['feedback'], ); - // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison -- Intended. + // phpcs:ignore Universal.Operators.StrictComparisons.LooseComparison -- Intended. if ( $comments_based_grade != $tables_based_grade ) { $this->add_error( 'Grades mismatch.', diff --git a/includes/internal/student-progress/course-progress/repositories/class-comments-based-course-progress-repository.php b/includes/internal/student-progress/course-progress/repositories/class-comments-based-course-progress-repository.php index 4e58a6e8ba..8a2fe0a5f5 100644 --- a/includes/internal/student-progress/course-progress/repositories/class-comments-based-course-progress-repository.php +++ b/includes/internal/student-progress/course-progress/repositories/class-comments-based-course-progress-repository.php @@ -266,7 +266,7 @@ private function delete_activities( array $args ): void { private function assert_comments_based_course_progress( Course_Progress_Interface $course_progress ): void { if ( ! $course_progress instanceof Comments_Based_Course_Progress ) { $actual_type = get_class( $course_progress ); - throw new \InvalidArgumentException( "Expected Comments_Based_Course_Progress, got {$actual_type}." ); + throw new \InvalidArgumentException( esc_html( "Expected Comments_Based_Course_Progress, got {$actual_type}." ) ); } } diff --git a/includes/internal/student-progress/course-progress/repositories/class-tables-based-course-progress-repository.php b/includes/internal/student-progress/course-progress/repositories/class-tables-based-course-progress-repository.php index 9d07232fd9..1510d111ff 100644 --- a/includes/internal/student-progress/course-progress/repositories/class-tables-based-course-progress-repository.php +++ b/includes/internal/student-progress/course-progress/repositories/class-tables-based-course-progress-repository.php @@ -270,7 +270,7 @@ public function delete_for_user( int $user_id ): void { private function assert_tables_based_course_progress( Course_Progress_Interface $course_progress ): void { if ( ! $course_progress instanceof Tables_Based_Course_Progress ) { $actual_type = get_class( $course_progress ); - throw new \InvalidArgumentException( "Expected Tables_Based_Course_Progress, got {$actual_type}." ); + throw new \InvalidArgumentException( esc_html( "Expected Tables_Based_Course_Progress, got {$actual_type}." ) ); } } diff --git a/includes/internal/student-progress/lesson-progress/repositories/class-comments-based-lesson-progress-repository.php b/includes/internal/student-progress/lesson-progress/repositories/class-comments-based-lesson-progress-repository.php index c0989a0b56..8a9a6625a2 100644 --- a/includes/internal/student-progress/lesson-progress/repositories/class-comments-based-lesson-progress-repository.php +++ b/includes/internal/student-progress/lesson-progress/repositories/class-comments-based-lesson-progress-repository.php @@ -265,7 +265,7 @@ private function delete_activities( array $args ): void { private function assert_comments_based_lesson_progress( Lesson_Progress_Interface $lesson_progress ): void { if ( ! $lesson_progress instanceof Comments_Based_Lesson_Progress ) { $actual_type = get_class( $lesson_progress ); - throw new InvalidArgumentException( "Expected Comments_Based_Lesson_Progress, got {$actual_type}." ); + throw new InvalidArgumentException( esc_html( "Expected Comments_Based_Lesson_Progress, got {$actual_type}." ) ); } } diff --git a/includes/internal/student-progress/lesson-progress/repositories/class-tables-based-lesson-progress-repository.php b/includes/internal/student-progress/lesson-progress/repositories/class-tables-based-lesson-progress-repository.php index ae5e9b701d..b94a7970c1 100644 --- a/includes/internal/student-progress/lesson-progress/repositories/class-tables-based-lesson-progress-repository.php +++ b/includes/internal/student-progress/lesson-progress/repositories/class-tables-based-lesson-progress-repository.php @@ -10,7 +10,6 @@ use DateTimeImmutable; use DateTimeZone; use InvalidArgumentException; -use RuntimeException; use Sensei\Internal\Student_Progress\Lesson_Progress\Models\Lesson_Progress_Interface; use Sensei\Internal\Student_Progress\Lesson_Progress\Models\Tables_Based_Lesson_Progress; use wpdb; @@ -306,7 +305,7 @@ public function count( int $course_id, int $user_id ): int { private function assert_tables_based_lesson_progress( Lesson_Progress_Interface $lesson_progress ): void { if ( ! $lesson_progress instanceof Tables_Based_Lesson_Progress ) { $actual_type = get_class( $lesson_progress ); - throw new InvalidArgumentException( "Expected Tables_Based_Lesson_Progress, got {$actual_type}." ); + throw new InvalidArgumentException( esc_html( "Expected Tables_Based_Lesson_Progress, got {$actual_type}." ) ); } } diff --git a/includes/internal/student-progress/quiz-progress/repositories/class-comments-based-quiz-progress-repository.php b/includes/internal/student-progress/quiz-progress/repositories/class-comments-based-quiz-progress-repository.php index 3f192ee85b..2bf84fae94 100644 --- a/includes/internal/student-progress/quiz-progress/repositories/class-comments-based-quiz-progress-repository.php +++ b/includes/internal/student-progress/quiz-progress/repositories/class-comments-based-quiz-progress-repository.php @@ -205,7 +205,7 @@ private function delete_grade_and_answers( $comment_id ): void { private function assert_comments_based_quiz_progress( Quiz_Progress_Interface $quiz_progress ): void { if ( ! $quiz_progress instanceof Comments_Based_Quiz_Progress ) { $actual_type = get_class( $quiz_progress ); - throw new \InvalidArgumentException( "Expected Comments_Based_Quiz_Progress, got {$actual_type}." ); + throw new \InvalidArgumentException( esc_html( "Expected Comments_Based_Quiz_Progress, got {$actual_type}." ) ); } } diff --git a/includes/internal/student-progress/quiz-progress/repositories/class-tables-based-quiz-progress-repository.php b/includes/internal/student-progress/quiz-progress/repositories/class-tables-based-quiz-progress-repository.php index ed77db6b5a..7a6e3ac1bc 100644 --- a/includes/internal/student-progress/quiz-progress/repositories/class-tables-based-quiz-progress-repository.php +++ b/includes/internal/student-progress/quiz-progress/repositories/class-tables-based-quiz-progress-repository.php @@ -269,7 +269,7 @@ public function delete_for_user( int $user_id ): void { private function assert_tables_based_quiz_progress( Quiz_Progress_Interface $quiz_progress ): void { if ( ! $quiz_progress instanceof Tables_Based_Quiz_Progress ) { $actual_type = get_class( $quiz_progress ); - throw new \InvalidArgumentException( "Expected Tables_Based_Quiz_Progress, got {$actual_type}." ); + throw new \InvalidArgumentException( esc_html( "Expected Tables_Based_Quiz_Progress, got {$actual_type}." ) ); } } diff --git a/phpcs.xml.dist b/phpcs.xml.dist index 77a4323450..3c96bd0323 100644 --- a/phpcs.xml.dist +++ b/phpcs.xml.dist @@ -17,13 +17,13 @@ ^tmp/* - + - + @@ -39,7 +39,7 @@ /includes/class-sensei-dependency-checker.php - + /sensei-lms.php /uninstall.php /includes/class-sensei-dependency-checker.php diff --git a/tests/bootstrap.php b/tests/bootstrap.php index ad03da42df..ed73860507 100755 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -66,9 +66,8 @@ public function __construct() { * @return mixed */ public function prevent_requests( $preempt ) { - $error = 'You should use the filter `pre_http_request` to prevent requests in the tests'; if ( false === $preempt ) { - throw new Exception( $error ); + throw new Exception( 'You should use the filter `pre_http_request` to prevent requests in the tests' ); } return $preempt; } diff --git a/tests/framework/trait-sensei-test-redirect-helpers.php b/tests/framework/trait-sensei-test-redirect-helpers.php index 676bb436be..dfd75f8793 100644 --- a/tests/framework/trait-sensei-test-redirect-helpers.php +++ b/tests/framework/trait-sensei-test-redirect-helpers.php @@ -18,7 +18,8 @@ trait Sensei_Test_Redirect_Helpers { * Throws a Sensei_WP_Redirect_Exception instead. */ private function prevent_wp_redirect(): void { - $callback = function( $location, $status ) { + $callback = function ( $location, $status ) { + // phpcs:ignore WordPress.Security.EscapeOutput.ExceptionNotEscaped throw new Sensei_WP_Redirect_Exception( $location, $status ); }; diff --git a/tests/unit-tests/internal/tools/test-class-progress-tables-eraser.php b/tests/unit-tests/internal/tools/test-class-progress-tables-eraser.php index da68306c9f..e12e6f325a 100644 --- a/tests/unit-tests/internal/tools/test-class-progress-tables-eraser.php +++ b/tests/unit-tests/internal/tools/test-class-progress-tables-eraser.php @@ -19,6 +19,7 @@ class Progress_Tables_Eraser_Test extends \WP_UnitTestCase { private $eraser; public function filterWpRedirect( $location, $status ) { + // phpcs:ignore WordPress.Security.EscapeOutput.ExceptionNotEscaped throw new \Exception( $location, $status ); }