From 42be855e1e1a288e396fe5137ed7500097d9dd20 Mon Sep 17 00:00:00 2001 From: Brian Date: Mon, 8 Jun 2026 22:27:32 +0200 Subject: [PATCH 1/3] prepare wp 7.1 release --- .github/workflows/test.yml | 13 +------------ AGENTS.md | 2 +- composer.json | 6 +++--- phpcs.xml.dist | 4 ++-- readme.txt | 4 +++- two-factor.php | 4 ++-- 6 files changed, 12 insertions(+), 21 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 308a2620..ac520303 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -88,21 +88,10 @@ jobs: - '8.1' - '8.0' - '7.4' - - '7.3' - - '7.2' wp: - latest - trunk - - '6.9' - exclude: - - php: '7.3' - wp: trunk - - php: '7.2' - wp: trunk - - php: '7.3' - wp: latest - - php: '7.2' - wp: latest + - '7.0' env: WP_ENV_PHP_VERSION: ${{ matrix.php }} diff --git a/AGENTS.md b/AGENTS.md index 4b2cc1de..7d827f37 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -103,7 +103,7 @@ Namespace: `two-factor/1.0` (constant `Two_Factor_Core::REST_NAMESPACE`). Each p ## Code Standards -- PHP 7.2+ compatibility required; enforced by PHPCompatibilityWP. +- PHP 7.4+ compatibility required; enforced by PHPCompatibilityWP. - Follows WordPress coding standards (WPCS) and WordPress-VIP-Go rules. - `includes/` is excluded from PHPCS — those files intentionally override core functions. - The codebase does not fully pass all PHPCS checks (known issue [#437](https://github.com/WordPress/two-factor/issues/437)). Do not treat existing violations as license to introduce new ones. diff --git a/composer.json b/composer.json index c79584a5..633e07a2 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ "config": { "sort-packages": true, "platform": { - "php": "7.2.24" + "php": "7.4.0" }, "allow-plugins": { "dealerdirect/phpcodesniffer-composer-installer": true @@ -21,7 +21,7 @@ "minimum-stability": "dev", "prefer-stable" : true, "require": { - "php": ">=7.2.24|^8" + "php": ">=7.4|^8" }, "require-dev": { "automattic/vipwpcs": "^3.0", @@ -35,7 +35,7 @@ }, "scripts": { "lint": "phpcs", - "lint-compat": "phpcs -p --standard=PHPCompatibilityWP --runtime-set testVersion 7.2- --extensions=php --ignore='tests/,dist/,includes/Yubico/,vendor/,node_modules/' .", + "lint-compat": "phpcs -p --standard=PHPCompatibilityWP --runtime-set testVersion 7.4- --extensions=php --ignore='tests/,dist/,includes/Yubico/,vendor/,node_modules/' .", "lint-phpstan": "phpstan analyse --verbose --memory-limit=1G", "test": "phpunit --coverage-text", "test:watch": [ diff --git a/phpcs.xml.dist b/phpcs.xml.dist index 5d16e868..987b928c 100644 --- a/phpcs.xml.dist +++ b/phpcs.xml.dist @@ -9,9 +9,9 @@ . - + - + diff --git a/readme.txt b/readme.txt index 149998a6..cd1609f3 100644 --- a/readme.txt +++ b/readme.txt @@ -1,8 +1,10 @@ === Two Factor === Contributors: georgestephanis, kasparsd, masteradhoc, valendesigns, stevenkword, jeffpaul, extendwings, sgrant, aaroncampbell, johnbillion, stevegrunwell, netweb, alihusnainarshad, passoniate Tags: 2fa, mfa, totp, authentication, security -Tested up to: 7.0 +Requires at least: 7.0 +Tested up to: 7.1 Stable tag: 0.16.0 +Requires PHP: 7.4 License: GPL-2.0-or-later License URI: https://spdx.org/licenses/GPL-2.0-or-later.html diff --git a/two-factor.php b/two-factor.php index d1cc2413..66490d32 100644 --- a/two-factor.php +++ b/two-factor.php @@ -11,9 +11,9 @@ * Plugin Name: Two Factor * Plugin URI: https://wordpress.org/plugins/two-factor/ * Description: Enable Two-Factor Authentication using time-based one-time passwords, email, and backup verification codes. - * Requires at least: 6.9 + * Requires at least: 7.0 * Version: 0.16.0 - * Requires PHP: 7.2 + * Requires PHP: 7.4 * Author: WordPress.org Contributors * Author URI: https://github.com/wordpress/two-factor/graphs/contributors * License: GPL-2.0-or-later From 6702ecbc2e08a76f513740895d9eff0bad9f3f90 Mon Sep 17 00:00:00 2001 From: Brian Date: Mon, 8 Jun 2026 22:42:21 +0200 Subject: [PATCH 2/3] revert composer --- composer.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 633e07a2..fd92c513 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ "config": { "sort-packages": true, "platform": { - "php": "7.4.0" + "php": "7.2.24" }, "allow-plugins": { "dealerdirect/phpcodesniffer-composer-installer": true @@ -21,7 +21,7 @@ "minimum-stability": "dev", "prefer-stable" : true, "require": { - "php": ">=7.4|^8" + "php": ">=7.2.24|^8" }, "require-dev": { "automattic/vipwpcs": "^3.0", @@ -36,6 +36,7 @@ "scripts": { "lint": "phpcs", "lint-compat": "phpcs -p --standard=PHPCompatibilityWP --runtime-set testVersion 7.4- --extensions=php --ignore='tests/,dist/,includes/Yubico/,vendor/,node_modules/' .", + "lint-compat": "phpcs -p --standard=PHPCompatibilityWP --runtime-set testVersion 7.2- --extensions=php --ignore='tests/,dist/,includes/Yubico/,vendor/,node_modules/' .", "lint-phpstan": "phpstan analyse --verbose --memory-limit=1G", "test": "phpunit --coverage-text", "test:watch": [ From c25d7c417a943bffc9632e37dc04f4c2c56900e9 Mon Sep 17 00:00:00 2001 From: Brian Date: Mon, 8 Jun 2026 22:42:58 +0200 Subject: [PATCH 3/3] revert composer json --- composer.json | 1 - 1 file changed, 1 deletion(-) diff --git a/composer.json b/composer.json index fd92c513..c79584a5 100644 --- a/composer.json +++ b/composer.json @@ -35,7 +35,6 @@ }, "scripts": { "lint": "phpcs", - "lint-compat": "phpcs -p --standard=PHPCompatibilityWP --runtime-set testVersion 7.4- --extensions=php --ignore='tests/,dist/,includes/Yubico/,vendor/,node_modules/' .", "lint-compat": "phpcs -p --standard=PHPCompatibilityWP --runtime-set testVersion 7.2- --extensions=php --ignore='tests/,dist/,includes/Yubico/,vendor/,node_modules/' .", "lint-phpstan": "phpstan analyse --verbose --memory-limit=1G", "test": "phpunit --coverage-text",