Add testing on WordPress 7.0, bump minimum supported version

.github/workflows/acceptance-tests.yml

@@ -38,26 +38,29 @@ jobs:
       # See the following for PHP compatibility of WordPress versions:
       # https://make.wordpress.org/core/handbook/references/php-compatibility-and-wordpress-versions/
       matrix:
-        wp:
-          # Three most recent versions of WordPress
-          - '6.9'
-          - '6.8'
-          - '6.7'
-        php:
-          # Most recent version of PHP supported by all of the above, plus 7.4
-          - '8.4'
-          - '7.4'
         include:
-          # Latest WordPress on latest PHP
-          # - wp: '6.9'
-          #   php: '8.5'
-          # Oldest supported WordPress on its newest supported PHP, plus 7.4:
-          - wp: '6.1'
+          # Latest:
+          - wp: '7.0'
+            php: '8.5'
+          - wp: '7.0'
+            php: '7.4'
+          # Latest -1:
+          - wp: '6.9'
+            php: '8.5'
+          - wp: '6.9'
+            php: '7.4'
+          # Latest -2:
+          - wp: '6.8'
+            php: '8.4'
+          - wp: '6.8'
+            php: '7.4'
+          # Oldest supported:
+          - wp: '6.2'
             php: '8.2'
-          - wp: '6.1'
+          - wp: '6.2'
             php: '7.4'
       fail-fast: false
-    uses: johnbillion/plugin-infrastructure/.github/workflows/reusable-acceptance-tests.yml@cc47e37177c694e00b901a5dc89fda5644bc550f # 2.9.1
+    uses: johnbillion/plugin-infrastructure/.github/workflows/reusable-acceptance-tests.yml@667f50aeb549afa5a5cf0137a21a08de1bc983f5 # 2.9.3
     with:
       wp: ${{ matrix.wp }}
       php: ${{ matrix.php }}

.github/workflows/coding-standards.yml

@@ -32,7 +32,7 @@ jobs:
     name: ${{ matrix.label }}
     permissions:
       contents: read # Needed to clone the repo.
-    uses: johnbillion/plugin-infrastructure/.github/workflows/reusable-coding-standards.yml@cc47e37177c694e00b901a5dc89fda5644bc550f # 2.9.1
+    uses: johnbillion/plugin-infrastructure/.github/workflows/reusable-coding-standards.yml@667f50aeb549afa5a5cf0137a21a08de1bc983f5 # 2.9.3
     strategy:
       matrix:
         label:

.github/workflows/deploy-assets.yml

@@ -13,7 +13,7 @@ jobs:
     name: WordPress.org
     permissions:
       contents: read # Needed to clone the repo.
-    uses: johnbillion/plugin-infrastructure/.github/workflows/reusable-deploy-assets.yml@cc47e37177c694e00b901a5dc89fda5644bc550f # 2.9.1
+    uses: johnbillion/plugin-infrastructure/.github/workflows/reusable-deploy-assets.yml@667f50aeb549afa5a5cf0137a21a08de1bc983f5 # 2.9.3
     with:
       plugin: user-switching
       readme: readme.txt

.github/workflows/deploy-tag.yml

@@ -19,7 +19,7 @@ jobs:
   deploy:
     name: Deploy Tag
     if: github.event_name == 'workflow_dispatch' || github.event.release.prerelease == false
-    uses: johnbillion/plugin-infrastructure/.github/workflows/reusable-deploy-tag.yml@cc47e37177c694e00b901a5dc89fda5644bc550f # 2.9.1
+    uses: johnbillion/plugin-infrastructure/.github/workflows/reusable-deploy-tag.yml@667f50aeb549afa5a5cf0137a21a08de1bc983f5 # 2.9.3
     permissions:
       contents: write      # Required to push the new branch
       issues: write        # Required for write access to milestones.

.github/workflows/integration-tests.yml

@@ -34,28 +34,30 @@ jobs:
     name: WP ${{ matrix.wp }}
     permissions:
       contents: read # Needed to clone the repo.
-    uses: johnbillion/plugin-infrastructure/.github/workflows/reusable-integration-tests.yml@cc47e37177c694e00b901a5dc89fda5644bc550f # 2.9.1
+    uses: johnbillion/plugin-infrastructure/.github/workflows/reusable-integration-tests.yml@667f50aeb549afa5a5cf0137a21a08de1bc983f5 # 2.9.3
     strategy:
       # See the following for PHP compatibility of WordPress versions:
       # https://make.wordpress.org/core/handbook/references/php-compatibility-and-wordpress-versions/
       matrix:
         wp:
-          # Three most recent versions of WordPress
+          # Three most recent versions of WordPress:
+          - '7.0'
           - '6.9'
           - '6.8'
-          - '6.7'
         php:
-          # Most recent version of PHP supported by all of the above, plus 7.4
+          # Most recent version of PHP supported by all of the above:
           - '8.4'
+          # Oldest support PHP:
           - '7.4'
         include:
-          # Latest WordPress on latest PHP
-          - wp: '6.9'
+          # Latest WordPress on latest PHP:
+          - wp: '7.0'
             php: '8.5'
-          # Oldest supported WordPress on its newest supported PHP, plus 7.4:
-          - wp: '6.1'
+          # Oldest supported WordPress on its newest supported PHP:
+          - wp: '6.2'
             php: '8.2'
-          - wp: '6.1'
+          # Oldest supported WordPress on oldest support PHP:
+          - wp: '6.2'
             php: '7.4'
       fail-fast: false
     with:

.github/workflows/lint-workflows.yml

@@ -27,4 +27,4 @@ jobs:
       security-events: write # Required for upload-sarif to upload SARIF files.
       contents: read         # Needed to clone the repo.
       actions: read          # Needed for upload-sarif to read workflow run info.
-    uses: johnbillion/plugin-infrastructure/.github/workflows/reusable-workflow-lint.yml@cc47e37177c694e00b901a5dc89fda5644bc550f # 2.9.1
+    uses: johnbillion/plugin-infrastructure/.github/workflows/reusable-workflow-lint.yml@667f50aeb549afa5a5cf0137a21a08de1bc983f5 # 2.9.3

.github/workflows/nightly-tests.yml

@@ -41,7 +41,7 @@ jobs:
           - '8.3'
           - '7.4'
       fail-fast: false
-    uses: johnbillion/plugin-infrastructure/.github/workflows/reusable-acceptance-tests.yml@cc47e37177c694e00b901a5dc89fda5644bc550f # 2.9.1
+    uses: johnbillion/plugin-infrastructure/.github/workflows/reusable-acceptance-tests.yml@667f50aeb549afa5a5cf0137a21a08de1bc983f5 # 2.9.3
     with:
       wp: 'nightly'
       php: ${{ matrix.php }}
@@ -52,7 +52,7 @@ jobs:
     name: Nightly ${{ matrix.label }}
     permissions:
       contents: read # Needed to clone the repo.
-    uses: johnbillion/plugin-infrastructure/.github/workflows/reusable-integration-tests.yml@cc47e37177c694e00b901a5dc89fda5644bc550f # 2.9.1
+    uses: johnbillion/plugin-infrastructure/.github/workflows/reusable-integration-tests.yml@667f50aeb549afa5a5cf0137a21a08de1bc983f5 # 2.9.3
     strategy:
       matrix:
         label:

.github/workflows/static-analysis.yml

@@ -28,7 +28,7 @@ jobs:
     name: ${{ matrix.label }}
     permissions:
       contents: read # Needed to clone the repo.
-    uses: johnbillion/plugin-infrastructure/.github/workflows/reusable-static-analysis.yml@cc47e37177c694e00b901a5dc89fda5644bc550f # 2.9.1
+    uses: johnbillion/plugin-infrastructure/.github/workflows/reusable-static-analysis.yml@667f50aeb549afa5a5cf0137a21a08de1bc983f5 # 2.9.3
     strategy:
       matrix:
         label:

.github/workflows/verify-distribution.yml

@@ -34,7 +34,7 @@ jobs:
     permissions:
       contents: write      # Needed to push commits
       pull-requests: write # Needed to create a PR
-    uses: johnbillion/plugin-infrastructure/.github/workflows/reusable-verify-distribution.yml@cc47e37177c694e00b901a5dc89fda5644bc550f # 2.9.1
+    uses: johnbillion/plugin-infrastructure/.github/workflows/reusable-verify-distribution.yml@667f50aeb549afa5a5cf0137a21a08de1bc983f5 # 2.9.3
     with:
       plugin: user-switching
       owner: johnbillion

composer.json

@@ -27,9 +27,9 @@
 		"composer/installers": "^1.0 || ^2.0"
 	},
 	"require-dev": {
-		"johnbillion/plugin-infrastructure": "2.9.1",
-		"johnbillion/wp-compat": "1.3.0",
-		"php-stubs/wordpress-stubs": "6.9.0",
+		"johnbillion/plugin-infrastructure": "2.9.3",
+		"johnbillion/wp-compat": "1.5.0",
+		"php-stubs/wordpress-stubs": "7.0.0 as 6.9.4",
 		"phpcompatibility/phpcompatibility-wp": "2.1.8",
 		"phpstan/phpstan": "2.1.33",
 		"phpstan/phpstan-phpunit": "2.0.11",
@@ -79,7 +79,7 @@
 			"phpcs -ps --colors --report-code --report-summary --report-width=80 --basepath='./' ."
 		],
 		"test:phpstan": [
-			"phpstan analyze -v --memory-limit=1024M"
+			"phpstan analyze -v --memory-limit=2G"
 		],
 		"test:start": [
 			"tests-start"

package.json

@@ -10,8 +10,9 @@
 	"engines": {
 		"node": ">=24"
 	},
+	"type": "module",
 	"devDependencies": {
-		"@johnbillion/plugin-infrastructure": "2.9.1",
+		"@johnbillion/plugin-infrastructure": "2.9.3",
 		"@jsdevtools/version-bump-prompt": "^6.1.0",
 		"@playwright/test": "^1.55.0",
 		"@types/node": "^24.3.0",

phpcs.xml.dist

@@ -2,7 +2,7 @@
 <ruleset name="User Switching">
 	<arg name="cache" value="tests/cache/phpcs.json"/>
 
-	<config name="minimum_wp_version" value="6.1"/>
+	<config name="minimum_wp_version" value="6.2"/>
 	<config name="testVersion" value="7.4-"/>
 
 	<exclude-pattern>/.wordpress-org/*</exclude-pattern>

readme.txt

@@ -1,7 +1,7 @@
 # User Switching
 
 Stable tag: 1.11.2
-Tested up to: 6.9
+Tested up to: 7.0
 License: GPL v2 or later
 Tags: users, user switching, fast user switching, multisite, woocommerce
 Contributors: johnbillion

user-switching.php

@@ -17,7 +17,7 @@
  * Text Domain:       user-switching
  * Domain Path:       /languages/
  * Network:           true
- * Requires at least: 6.1
+ * Requires at least: 6.2
  * Requires PHP:      7.4
  * License URI:       https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
  *
@@ -487,9 +487,8 @@ public function action_admin_notices(): void {
 		$old_user = self::get_old_user();
 
 		if ( $old_user instanceof WP_User ) {
-			$locale = get_user_locale( $old_user );
-			$switched_locale = switch_to_locale( $locale );
-			$lang_attr = str_replace( '_', '-', $locale );
+			$switched_locale = switch_to_user_locale( $old_user->ID );
+			$lang_attr = str_replace( '_', '-', get_user_locale( $old_user ) );
 
 			?>
 			<div id="user_switching" class="updated notice notice-success is-dismissible">
@@ -678,7 +677,7 @@ public function action_admin_bar_menu( WP_Admin_Bar $wp_admin_bar ): void {
 	 * Adds a 'Switch back to {user}' link to access denied messages within the admin area.
 	 */
 	public function action_shutdown_for_wp_die(): void {
-		if ( ! did_action( 'admin_page_access_denied' ) && ! ( function_exists( 'did_filter' ) && did_filter( 'wp_die_handler' ) ) ) {
+		if ( ! did_action( 'admin_page_access_denied' ) && ! did_filter( 'wp_die_handler' ) ) {
 			return;
 		}
 
@@ -1062,7 +1061,7 @@ public static function switched_to_message( WP_User $user ): string {
 	 * @return string The message.
 	 */
 	public static function switch_back_message( WP_User $user ): string {
-		$switched_locale = switch_to_locale( get_user_locale( $user ) );
+		$switched_locale = switch_to_user_locale( $user->ID );
 
 		$message = sprintf(
 			/* Translators: 1: user display name; 2: username; */