Merge pull request #57 from Automattic/fix/admin-warning-different-ports

Fix is_decoupled() warning when frontend is running on different port
Automattic · Aug 4, 2022 · 74ad59a · 74ad59a
2 parents e843be5 + 1125d5b
commit 74ad59a
Show file tree

Hide file tree

Showing 4 changed files with 137 additions and 247 deletions.
diff --git a/.wp-env.json b/.wp-env.json
@@ -2,5 +2,6 @@
 	"plugins": [
 		"."
 	],
-	"config": {}
+	"config": {},
+	"core": "WordPress/WordPress#6.0.1"
 }
diff --git a/admin/admin.php b/admin/admin.php
@@ -12,8 +12,13 @@
  * @return bool
  */
 function is_decoupled() {
-	$frontend = wp_parse_url( home_url(), PHP_URL_HOST );
-	$backend  = wp_parse_url( site_url(), PHP_URL_HOST );
+	$frontend_url  = wp_parse_url( home_url(), PHP_URL_HOST );
+	$frontend_port = wp_parse_url( home_url(), PHP_URL_PORT );
+	$frontend      = $frontend_url . ( $frontend_port ? ':' . $frontend_port : '' );
+
+	$backend_url  = wp_parse_url( site_url(), PHP_URL_HOST );
+	$backend_port = wp_parse_url( site_url(), PHP_URL_PORT );
+	$backend      = $backend_url . ( $backend_port ? ':' . $backend_port : '' );
 
 	return $frontend !== $backend;
 }

diff --git a/composer.json b/composer.json
@@ -9,8 +9,7 @@
         "phpcompatibility/phpcompatibility-wp": "^2.1",
         "dealerdirect/phpcodesniffer-composer-installer": "^0.7.1",
         "phpunit/phpunit": "^7",
-        "yoast/phpunit-polyfills": "^1.0",
-        "wp-phpunit/wp-phpunit": "^5.9"
+        "yoast/phpunit-polyfills": "^1.0"
     },
     "scripts": {
         "phpcs": "phpcs",