Use WP_MULTISITE=1 environment var instead of separate config

Co-authored-by: Lovekesh Kumar <lovekesh.kumar@rtcamp.com>
WordPress · Jul 5, 2024 · 7dbe3ad · 7dbe3ad
1 parent 936bcb3
commit 7dbe3ad
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -47,7 +47,6 @@ plugins/optimization-detective/detection/web-vitals*
 ############
 phpcs.xml
 phpunit.xml
-phpunit-multisite.xml
 phpstan.neon
 
 ############

diff --git a/composer.json b/composer.json
@@ -82,8 +82,7 @@
     "phpstan": "phpstan analyse --memory-limit=2048M",
     "test": "phpunit",
     "test-multisite": [
-      "php bin/generate-multisite-phpunit.php",
-      "@test -c phpunit-multisite.xml"
+      "WP_MULTISITE=1 phpunit --exclude-group=ms-excluded"
     ],
     "test-multisite:plugins": [
       "@test-multisite:auto-sizes",

diff --git a/tools/phpcs/phpcs.ruleset.xml b/tools/phpcs/phpcs.ruleset.xml
@@ -68,7 +68,6 @@
 	<rule ref="WordPress.NamingConventions.ValidVariableName">
 		<properties>
 			<property name="allowed_custom_properties" type="array">
-				<element value="documentElement"/>
 				<element value="nodeValue"/>
 				<element value="parentNode"/>
 				<element value="createTextNode"/>