diff --git a/WpMailCatcher.php b/WpMailCatcher.php
index 7c8608d..3f61aff 100644
--- a/WpMailCatcher.php
+++ b/WpMailCatcher.php
@@ -6,7 +6,7 @@
Domain Path: /languages
Description: Logging your mail will stop you from ever losing your emails again! This fast, lightweight plugin (under 140kb in size!) is also useful for debugging or backing up your messages.
Author: James Ward
-Version: 2.1.6
+Version: 2.1.7
Author URI: https://jamesward.io
Donate link: https://paypal.me/jamesmward
*/
diff --git a/build/grunt/package.json b/build/grunt/package.json
index fe6d418..f628405 100644
--- a/build/grunt/package.json
+++ b/build/grunt/package.json
@@ -1,6 +1,6 @@
{
"name": "WpMailCatcher",
- "version": "2.1.6",
+ "version": "2.1.7",
"lang_po_directory": "../../languages",
"build_directory": "./..",
"dist_directory": "../../assets",
diff --git a/composer.json b/composer.json
index 95c5b80..962f794 100644
--- a/composer.json
+++ b/composer.json
@@ -13,7 +13,7 @@
},
"require-dev": {
"phpunit/phpunit": "^8.0",
- "yoast/phpunit-polyfills": "^1.0",
+ "yoast/phpunit-polyfills": "^1.1",
"phpstan/phpstan": "^1.8",
"szepeviktor/phpstan-wordpress": "^1.1",
"phpstan/extension-installer": "^1.1",
diff --git a/composer.lock b/composer.lock
index 47c6178..d427a6c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,102 +4,9 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "01fa34b9135e01ed7e25ef51a3aac754",
+ "content-hash": "90fdb4620b1d111af6c6f9e81c1a36de",
"packages": [],
"packages-dev": [
- {
- "name": "10up/wp_mock",
- "version": "0.4.2",
- "source": {
- "type": "git",
- "url": "https://github.com/10up/wp_mock.git",
- "reference": "9019226eb50df275aa86bb15bfc98a619601ee49"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/10up/wp_mock/zipball/9019226eb50df275aa86bb15bfc98a619601ee49",
- "reference": "9019226eb50df275aa86bb15bfc98a619601ee49",
- "shasum": ""
- },
- "require": {
- "antecedent/patchwork": "^2.1",
- "mockery/mockery": "^1.0",
- "php": ">=7.1",
- "phpunit/phpunit": ">=7.0"
- },
- "require-dev": {
- "behat/behat": "^3.0",
- "php-coveralls/php-coveralls": "^2.1",
- "sebastian/comparator": ">=1.2.3"
- },
- "type": "library",
- "autoload": {
- "psr-4": {
- "WP_Mock\\": "./php/WP_Mock"
- },
- "classmap": [
- "php/WP_Mock.php"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "GPL-2.0-or-later"
- ],
- "description": "A mocking library to take the pain out of unit testing for WordPress",
- "support": {
- "issues": "https://github.com/10up/wp_mock/issues",
- "source": "https://github.com/10up/wp_mock/tree/master"
- },
- "time": "2019-03-16T03:44:39+00:00"
- },
- {
- "name": "antecedent/patchwork",
- "version": "2.1.26",
- "source": {
- "type": "git",
- "url": "https://github.com/antecedent/patchwork.git",
- "reference": "f2dae0851b2eae4c51969af740fdd0356d7f8f55"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/antecedent/patchwork/zipball/f2dae0851b2eae4c51969af740fdd0356d7f8f55",
- "reference": "f2dae0851b2eae4c51969af740fdd0356d7f8f55",
- "shasum": ""
- },
- "require": {
- "php": ">=5.4.0"
- },
- "require-dev": {
- "phpunit/phpunit": ">=4"
- },
- "type": "library",
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Ignas Rudaitis",
- "email": "ignas.rudaitis@gmail.com"
- }
- ],
- "description": "Method redefinition (monkey-patching) functionality for PHP.",
- "homepage": "http://patchwork2.org/",
- "keywords": [
- "aop",
- "aspect",
- "interception",
- "monkeypatching",
- "redefinition",
- "runkit",
- "testing"
- ],
- "support": {
- "issues": "https://github.com/antecedent/patchwork/issues",
- "source": "https://github.com/antecedent/patchwork/tree/2.1.26"
- },
- "time": "2023-09-18T08:18:37+00:00"
- },
{
"name": "doctrine/instantiator",
"version": "1.5.0",
@@ -223,16 +130,16 @@
},
{
"name": "mockery/mockery",
- "version": "1.6.6",
+ "version": "1.6.7",
"source": {
"type": "git",
"url": "https://github.com/mockery/mockery.git",
- "reference": "b8e0bb7d8c604046539c1115994632c74dcb361e"
+ "reference": "0cc058854b3195ba21dc6b1f7b1f60f4ef3a9c06"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/mockery/mockery/zipball/b8e0bb7d8c604046539c1115994632c74dcb361e",
- "reference": "b8e0bb7d8c604046539c1115994632c74dcb361e",
+ "url": "https://api.github.com/repos/mockery/mockery/zipball/0cc058854b3195ba21dc6b1f7b1f60f4ef3a9c06",
+ "reference": "0cc058854b3195ba21dc6b1f7b1f60f4ef3a9c06",
"shasum": ""
},
"require": {
@@ -245,9 +152,7 @@
},
"require-dev": {
"phpunit/phpunit": "^8.5 || ^9.6.10",
- "psalm/plugin-phpunit": "^0.18.4",
- "symplify/easy-coding-standard": "^11.5.0",
- "vimeo/psalm": "^4.30"
+ "symplify/easy-coding-standard": "^12.0.8"
},
"type": "library",
"autoload": {
@@ -304,7 +209,7 @@
"security": "https://github.com/mockery/mockery/security/advisories",
"source": "https://github.com/mockery/mockery"
},
- "time": "2023-08-09T00:03:52+00:00"
+ "time": "2023-12-10T02:24:34+00:00"
},
{
"name": "myclabs/deep-copy",
@@ -478,28 +383,31 @@
},
{
"name": "php-stubs/wordpress-stubs",
- "version": "v6.2.0",
+ "version": "v6.4.1",
"source": {
"type": "git",
"url": "https://github.com/php-stubs/wordpress-stubs.git",
- "reference": "b73fe99eadf9fb56363619dac0343b6d19907dce"
+ "reference": "6d6063cf9464a306ca2a0529705d41312b08500b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-stubs/wordpress-stubs/zipball/b73fe99eadf9fb56363619dac0343b6d19907dce",
- "reference": "b73fe99eadf9fb56363619dac0343b6d19907dce",
+ "url": "https://api.github.com/repos/php-stubs/wordpress-stubs/zipball/6d6063cf9464a306ca2a0529705d41312b08500b",
+ "reference": "6d6063cf9464a306ca2a0529705d41312b08500b",
"shasum": ""
},
"require-dev": {
- "nikic/php-parser": "< 4.12.0",
- "php": "~7.3 || ~8.0",
+ "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.9"
+ "phpstan/phpstan": "^1.10.12",
+ "phpunit/phpunit": "^9.5",
+ "szepeviktor/phpcs-psr-12-neutron-hybrid-ruleset": "^0.8"
},
"suggest": {
"paragonie/sodium_compat": "Pure PHP implementation of libsodium",
- "symfony/polyfill-php73": "Symfony polyfill backporting some PHP 7.3+ features to lower PHP versions",
+ "symfony/polyfill-php80": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions",
"szepeviktor/phpstan-wordpress": "WordPress extensions for PHPStan"
},
"type": "library",
@@ -516,28 +424,28 @@
],
"support": {
"issues": "https://github.com/php-stubs/wordpress-stubs/issues",
- "source": "https://github.com/php-stubs/wordpress-stubs/tree/v6.2.0"
+ "source": "https://github.com/php-stubs/wordpress-stubs/tree/v6.4.1"
},
- "time": "2023-03-31T09:48:52+00:00"
+ "time": "2023-11-10T00:33:47+00:00"
},
{
"name": "phpstan/extension-installer",
- "version": "1.2.0",
+ "version": "1.3.1",
"source": {
"type": "git",
"url": "https://github.com/phpstan/extension-installer.git",
- "reference": "f06dbb052ddc394e7896fcd1cfcd533f9f6ace40"
+ "reference": "f45734bfb9984c6c56c4486b71230355f066a58a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpstan/extension-installer/zipball/f06dbb052ddc394e7896fcd1cfcd533f9f6ace40",
- "reference": "f06dbb052ddc394e7896fcd1cfcd533f9f6ace40",
+ "url": "https://api.github.com/repos/phpstan/extension-installer/zipball/f45734bfb9984c6c56c4486b71230355f066a58a",
+ "reference": "f45734bfb9984c6c56c4486b71230355f066a58a",
"shasum": ""
},
"require": {
"composer-plugin-api": "^2.0",
"php": "^7.2 || ^8.0",
- "phpstan/phpstan": "^1.8.0"
+ "phpstan/phpstan": "^1.9.0"
},
"require-dev": {
"composer/composer": "^2.0",
@@ -560,22 +468,22 @@
"description": "Composer plugin for automatic installation of PHPStan extensions",
"support": {
"issues": "https://github.com/phpstan/extension-installer/issues",
- "source": "https://github.com/phpstan/extension-installer/tree/1.2.0"
+ "source": "https://github.com/phpstan/extension-installer/tree/1.3.1"
},
- "time": "2022-10-17T12:59:16+00:00"
+ "time": "2023-05-24T08:59:17+00:00"
},
{
"name": "phpstan/phpstan",
- "version": "1.10.11",
+ "version": "1.10.55",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan.git",
- "reference": "8aa62e6ea8b58ffb650e02940e55a788cbc3fe21"
+ "reference": "9a88f9d18ddf4cf54c922fbeac16c4cb164c5949"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpstan/phpstan/zipball/8aa62e6ea8b58ffb650e02940e55a788cbc3fe21",
- "reference": "8aa62e6ea8b58ffb650e02940e55a788cbc3fe21",
+ "url": "https://api.github.com/repos/phpstan/phpstan/zipball/9a88f9d18ddf4cf54c922fbeac16c4cb164c5949",
+ "reference": "9a88f9d18ddf4cf54c922fbeac16c4cb164c5949",
"shasum": ""
},
"require": {
@@ -624,20 +532,20 @@
"type": "tidelift"
}
],
- "time": "2023-04-04T19:17:42+00:00"
+ "time": "2024-01-08T12:32:40+00:00"
},
{
"name": "phpstan/phpstan-phpunit",
- "version": "1.3.11",
+ "version": "1.3.15",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan-phpunit.git",
- "reference": "9e1b9de6d260461f6e99b6a8f2dbb0bbb98b579c"
+ "reference": "70ecacc64fe8090d8d2a33db5a51fe8e88acd93a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/9e1b9de6d260461f6e99b6a8f2dbb0bbb98b579c",
- "reference": "9e1b9de6d260461f6e99b6a8f2dbb0bbb98b579c",
+ "url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/70ecacc64fe8090d8d2a33db5a51fe8e88acd93a",
+ "reference": "70ecacc64fe8090d8d2a33db5a51fe8e88acd93a",
"shasum": ""
},
"require": {
@@ -650,7 +558,7 @@
"require-dev": {
"nikic/php-parser": "^4.13.0",
"php-parallel-lint/php-parallel-lint": "^1.2",
- "phpstan/phpstan-strict-rules": "^1.0",
+ "phpstan/phpstan-strict-rules": "^1.5.1",
"phpunit/phpunit": "^9.5"
},
"type": "phpstan-extension",
@@ -674,9 +582,9 @@
"description": "PHPUnit extensions and rules for PHPStan",
"support": {
"issues": "https://github.com/phpstan/phpstan-phpunit/issues",
- "source": "https://github.com/phpstan/phpstan-phpunit/tree/1.3.11"
+ "source": "https://github.com/phpstan/phpstan-phpunit/tree/1.3.15"
},
- "time": "2023-03-25T19:42:13+00:00"
+ "time": "2023-10-09T18:58:39+00:00"
},
{
"name": "phpunit/php-code-coverage",
@@ -977,16 +885,16 @@
},
{
"name": "phpunit/phpunit",
- "version": "8.5.33",
+ "version": "8.5.36",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "7d1ff0e8c6b35db78ff13e3e05517d7cbf7aa32e"
+ "reference": "9652df58e06a681429d8cfdaec3c43d6de581d5a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/7d1ff0e8c6b35db78ff13e3e05517d7cbf7aa32e",
- "reference": "7d1ff0e8c6b35db78ff13e3e05517d7cbf7aa32e",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/9652df58e06a681429d8cfdaec3c43d6de581d5a",
+ "reference": "9652df58e06a681429d8cfdaec3c43d6de581d5a",
"shasum": ""
},
"require": {
@@ -1016,9 +924,9 @@
"sebastian/version": "^2.0.1"
},
"suggest": {
- "ext-soap": "*",
- "ext-xdebug": "*",
- "phpunit/php-invoker": "^2.0.0"
+ "ext-soap": "To be able to generate mocks based on WSDL files",
+ "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage",
+ "phpunit/php-invoker": "To allow enforcing time limits"
},
"bin": [
"phpunit"
@@ -1054,7 +962,8 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
- "source": "https://github.com/sebastianbergmann/phpunit/tree/8.5.33"
+ "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
+ "source": "https://github.com/sebastianbergmann/phpunit/tree/8.5.36"
},
"funding": [
{
@@ -1070,7 +979,7 @@
"type": "tidelift"
}
],
- "time": "2023-02-27T13:04:50+00:00"
+ "time": "2023-12-01T16:52:15+00:00"
},
{
"name": "sebastian/code-unit-reverse-lookup",
@@ -1203,16 +1112,16 @@
},
{
"name": "sebastian/diff",
- "version": "3.0.3",
+ "version": "3.0.4",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/diff.git",
- "reference": "14f72dd46eaf2f2293cbe79c93cc0bc43161a211"
+ "reference": "6296a0c086dd0117c1b78b059374d7fcbe7545ae"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/14f72dd46eaf2f2293cbe79c93cc0bc43161a211",
- "reference": "14f72dd46eaf2f2293cbe79c93cc0bc43161a211",
+ "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/6296a0c086dd0117c1b78b059374d7fcbe7545ae",
+ "reference": "6296a0c086dd0117c1b78b059374d7fcbe7545ae",
"shasum": ""
},
"require": {
@@ -1257,7 +1166,7 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/diff/issues",
- "source": "https://github.com/sebastianbergmann/diff/tree/3.0.3"
+ "source": "https://github.com/sebastianbergmann/diff/tree/3.0.4"
},
"funding": [
{
@@ -1265,7 +1174,7 @@
"type": "github"
}
],
- "time": "2020-11-30T07:59:04+00:00"
+ "time": "2023-05-07T05:30:20+00:00"
},
{
"name": "sebastian/environment",
@@ -1409,16 +1318,16 @@
},
{
"name": "sebastian/global-state",
- "version": "3.0.2",
+ "version": "3.0.3",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/global-state.git",
- "reference": "de036ec91d55d2a9e0db2ba975b512cdb1c23921"
+ "reference": "66783ce213de415b451b904bfef9dda0cf9aeae0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/de036ec91d55d2a9e0db2ba975b512cdb1c23921",
- "reference": "de036ec91d55d2a9e0db2ba975b512cdb1c23921",
+ "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/66783ce213de415b451b904bfef9dda0cf9aeae0",
+ "reference": "66783ce213de415b451b904bfef9dda0cf9aeae0",
"shasum": ""
},
"require": {
@@ -1461,7 +1370,7 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/global-state/issues",
- "source": "https://github.com/sebastianbergmann/global-state/tree/3.0.2"
+ "source": "https://github.com/sebastianbergmann/global-state/tree/3.0.3"
},
"funding": [
{
@@ -1469,7 +1378,7 @@
"type": "github"
}
],
- "time": "2022-02-10T06:55:38+00:00"
+ "time": "2023-08-02T09:23:32+00:00"
},
{
"name": "sebastian/object-enumerator",
@@ -1803,16 +1712,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": {
@@ -1822,11 +1731,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": {
@@ -1841,35 +1750,58 @@
"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/polyfill-php73",
- "version": "v1.27.0",
+ "version": "v1.28.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php73.git",
- "reference": "9e8ecb5f92152187c4799efd3c96b78ccab18ff9"
+ "reference": "fe2f306d1d9d346a7fee353d0d5012e401e984b5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/9e8ecb5f92152187c4799efd3c96b78ccab18ff9",
- "reference": "9e8ecb5f92152187c4799efd3c96b78ccab18ff9",
+ "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fe2f306d1d9d346a7fee353d0d5012e401e984b5",
+ "reference": "fe2f306d1d9d346a7fee353d0d5012e401e984b5",
"shasum": ""
},
"require": {
@@ -1878,7 +1810,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "1.27-dev"
+ "dev-main": "1.28-dev"
},
"thanks": {
"name": "symfony/polyfill",
@@ -1919,7 +1851,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-php73/tree/v1.27.0"
+ "source": "https://github.com/symfony/polyfill-php73/tree/v1.28.0"
},
"funding": [
{
@@ -1935,26 +1867,26 @@
"type": "tidelift"
}
],
- "time": "2022-11-03T14:55:06+00:00"
+ "time": "2023-01-26T09:26:14+00:00"
},
{
"name": "szepeviktor/phpstan-wordpress",
- "version": "v1.2.0",
+ "version": "v1.3.2",
"source": {
"type": "git",
"url": "https://github.com/szepeviktor/phpstan-wordpress.git",
- "reference": "534f2666a169ee7389722460178764db976ea1c3"
+ "reference": "b8516ed6bab7ec50aae981698ce3f67f1be2e45a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/szepeviktor/phpstan-wordpress/zipball/534f2666a169ee7389722460178764db976ea1c3",
- "reference": "534f2666a169ee7389722460178764db976ea1c3",
+ "url": "https://api.github.com/repos/szepeviktor/phpstan-wordpress/zipball/b8516ed6bab7ec50aae981698ce3f67f1be2e45a",
+ "reference": "b8516ed6bab7ec50aae981698ce3f67f1be2e45a",
"shasum": ""
},
"require": {
"php": "^7.2 || ^8.0",
"php-stubs/wordpress-stubs": "^4.7 || ^5.0 || ^6.0",
- "phpstan/phpstan": "^1.10.0",
+ "phpstan/phpstan": "^1.10.30",
"symfony/polyfill-php73": "^1.12.0"
},
"require-dev": {
@@ -1965,6 +1897,9 @@
"phpunit/phpunit": "^8.0 || ^9.0",
"szepeviktor/phpcs-psr-12-neutron-hybrid-ruleset": "^0.8"
},
+ "suggest": {
+ "swissspidy/phpstan-no-private": "Detect usage of internal core functions, classes and methods"
+ },
"type": "phpstan-extension",
"extra": {
"phpstan": {
@@ -1992,32 +1927,22 @@
],
"support": {
"issues": "https://github.com/szepeviktor/phpstan-wordpress/issues",
- "source": "https://github.com/szepeviktor/phpstan-wordpress/tree/v1.2.0"
+ "source": "https://github.com/szepeviktor/phpstan-wordpress/tree/v1.3.2"
},
- "funding": [
- {
- "url": "https://www.paypal.me/szepeviktor",
- "type": "custom"
- },
- {
- "url": "https://github.com/szepeviktor",
- "type": "github"
- }
- ],
- "time": "2023-04-08T07:07:36+00:00"
+ "time": "2023-10-16T17:23:56+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": {
@@ -2046,7 +1971,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": [
{
@@ -2054,20 +1979,20 @@
"type": "github"
}
],
- "time": "2021-07-28T10:34:58+00:00"
+ "time": "2023-11-20T00:12:19+00:00"
},
{
"name": "yoast/phpunit-polyfills",
- "version": "1.0.5",
+ "version": "1.1.0",
"source": {
"type": "git",
"url": "https://github.com/Yoast/PHPUnit-Polyfills.git",
- "reference": "3b59adeef77fb1c03ff5381dbb9d68b0aaff3171"
+ "reference": "224e4a1329c03d8bad520e3fc4ec980034a4b212"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Yoast/PHPUnit-Polyfills/zipball/3b59adeef77fb1c03ff5381dbb9d68b0aaff3171",
- "reference": "3b59adeef77fb1c03ff5381dbb9d68b0aaff3171",
+ "url": "https://api.github.com/repos/Yoast/PHPUnit-Polyfills/zipball/224e4a1329c03d8bad520e3fc4ec980034a4b212",
+ "reference": "224e4a1329c03d8bad520e3fc4ec980034a4b212",
"shasum": ""
},
"require": {
@@ -2114,7 +2039,7 @@
"issues": "https://github.com/Yoast/PHPUnit-Polyfills/issues",
"source": "https://github.com/Yoast/PHPUnit-Polyfills"
},
- "time": "2023-03-30T23:39:05+00:00"
+ "time": "2023-08-19T14:25:08+00:00"
}
],
"aliases": [],
diff --git a/readme.txt b/readme.txt
index 544e55e..d9fde78 100644
--- a/readme.txt
+++ b/readme.txt
@@ -4,7 +4,7 @@ Tags: mail logging, email log, email logger, logging, email logging, mail, crm
Requires at least: 4.7
Tested up to: 6.4
Requires PHP: 7.4
-Stable tag: 2.1.6
+Stable tag: 2.1.7
License: GNU General Public License v3.0
License URI: https://raw.githubusercontent.com/JWardee/wp-mail-catcher/master/LICENSE
Donate link: https://paypal.me/jamesmward
@@ -94,6 +94,10 @@ Great! Please leave a note in our (GitHub tracker)
== Changelog ==
+= 2.1.7 =
+
+- Security: Added additional nonce checks to setting actions
+
= 2.1.6 =
- Fix: Logs not appearing in WP versions under 6.2
diff --git a/src/Bootstrap.php b/src/Bootstrap.php
index f176aba..c1547da 100644
--- a/src/Bootstrap.php
+++ b/src/Bootstrap.php
@@ -133,6 +133,10 @@ public function route()
if (current_user_can(Settings::get('default_view_role'))) {
/** Perform database upgrade */
if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'upgrade-database') {
+ if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'upgrade-database')) {
+ wp_die(GeneralHelper::$failedNonceMessage);
+ }
+
DatabaseUpgradeManager::getInstance()->doUpgrade();
GeneralHelper::redirectToThisHomeScreen();
}
@@ -231,6 +235,10 @@ public function route()
if (current_user_can(Settings::get('default_settings_role'))) {
if (isset($_REQUEST['action']) && $_REQUEST['action'] === 'rerun-migrations') {
+ if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'rerun_migrations')) {
+ wp_die(GeneralHelper::$failedNonceMessage);
+ }
+
DatabaseUpgradeManager::getInstance()->doUpgrade(true);
GeneralHelper::redirectToThisHomeScreen([
'trigger-rerun-migration-success' => true,
@@ -239,6 +247,10 @@ public function route()
}
if (isset($_REQUEST['action']) && $_REQUEST['action'] === 'trigger-auto-delete') {
+ if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'trigger_auto_delete')) {
+ wp_die(GeneralHelper::$failedNonceMessage);
+ }
+
ExpiredLogManager::removeExpiredLogs();
GeneralHelper::redirectToThisHomeScreen([
'trigger-auto-delete-success' => true,
diff --git a/src/Views/Log.php b/src/Views/Log.php
index 6fb0116..075e35c 100644
--- a/src/Views/Log.php
+++ b/src/Views/Log.php
@@ -31,7 +31,10 @@
to perform the upgrade.',
'WpMailCatcher'
),
- '?page=' . GeneralHelper::$adminPageSlug . '&action=upgrade-database'
+ wp_nonce_url(
+ '?page=' . GeneralHelper::$adminPageSlug . '&action=upgrade-database',
+ 'upgrade-database'
+ )
);
?>
diff --git a/src/Views/Settings.php b/src/Views/Settings.php
index fa38fca..a784d21 100644
--- a/src/Views/Settings.php
+++ b/src/Views/Settings.php
@@ -132,7 +132,10 @@
Rerun migrations',