From 95b638c891a0ba2454c2e353ebf0b437da47130d Mon Sep 17 00:00:00 2001
From: Phil Johnston <phil.johnston@wpengine.com>
Date: Fri, 19 May 2023 16:25:37 -0400
Subject: [PATCH] Fix php since wp-env changed

---
 .gitignore   | 1 +
 package.json | 2 +-
 phpunit.sh   | 7 ++-----
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3e6f9fd..e07dd52 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ build
 /phpcs.xml
 /.wp-env.json
 /.wp-env.json.bak
+.phpunit.result.cache
diff --git a/package.json b/package.json
index 091bd4f..4a72826 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
 		"test:js": "wp-scripts test-unit-js"
 	},
 	"devDependencies": {
-		"@wordpress/env": "^4.3.1",
+		"@wordpress/env": "^7.0.0",
 		"@wordpress/eslint-plugin": "^12.4.0",
 		"@wordpress/jest-preset-default": "^8.1.1",
 		"@wordpress/scripts": "24.0.0"
diff --git a/phpunit.sh b/phpunit.sh
index 7f6f955..3818906 100644
--- a/phpunit.sh
+++ b/phpunit.sh
@@ -14,8 +14,5 @@ sed -i.bak "s/REPLACE_WITH_PLUGIN_DIR_NAME/$plugindirname/g" .wp-env.json
 npx -p @wordpress/env wp-env start
 
 # Run PHPunit inside wp-env, targeting the plugin in question.
-if [ "$multisite" = "1" ]; then
-	npx -p @wordpress/env wp-env run phpunit "WP_MULTISITE=1 phpunit -c /var/www/html/wp-content/wpps-scripts/phpunit.xml.dist /var/www/html/wp-content/plugins/$plugindirname"
-else
-	npx -p @wordpress/env wp-env run phpunit "phpunit -c /var/www/html/wp-content/wpps-scripts/phpunit.xml.dist /var/www/html/wp-content/plugins/$plugindirname"
-fi
+npx -p @wordpress/env wp-env run --env-cwd=\"wp-content/wpps-scripts\" tests-wordpress phpunit -c ./phpunit.xml.dist /var/www/html/wp-content/plugins/$plugindirname
+