Skip to content

REST API: Rename check_domain_is_available() to check_url_is_available() #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lloc merged 2 commits into from
Sep 30, 2026
Merged

REST API: Rename check_domain_is_available() to check_url_is_available() #6

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4ef1358
REST API: Rename check_domain_is_available() to check_url_is_availabl…
spacedmonkey Sep 28, 2026
94b6c0e
Tests: Add unit tests for check_url_is_available().
spacedmonkey Sep 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
REST API: Rename check_domain_is_available() to check_url_is_availabl… 
…e().

The method checks both the `domain` and `path` of a prepared site, not
just the domain, so `check_domain_is_available()` was a misleading name.
Renamed to check_url_is_available() (domain + path together form the
site's URL) and updated its one call site accordingly. Docblock already
described the domain+path behavior correctly and needed no changes; no
tests reference the method by name, and the existing domain/path-taken
conflict tests (test_create_item_domain_validation, test_update_item_*)
continue to pass unchanged since this is a pure rename with no behavior
change.

See #40365.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
  • Loading branch information
@spacedmonkey @claude
spacedmonkey and claude committed Sep 28, 2026
commit 4ef13589720a6956e4ded2264e0d31be3717735e
8 changes: 4 additions & 4 deletions src/wp-includes/rest-api/endpoints/class-wp-rest-sites-controller.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -987,9 +987,9 @@ protected function prepare_item_for_database( $request ) {
$prepared_site['domain'] = $request['domain'];
}

$domain_check = $this->check_domain_is_available( $prepared_site, $request );
if ( is_wp_error( $domain_check ) ) {
return $domain_check;
$url_check = $this->check_url_is_available( $prepared_site, $request );
if ( is_wp_error( $url_check ) ) {
return $url_check;
}

/**
Expand Down Expand Up @@ -1173,7 +1173,7 @@ private function is_valid_path( $path ) {
* @param WP_REST_Request $request The current request.
* @return true|WP_Error True if the domain and path are available, WP_Error otherwise.
*/
protected function check_domain_is_available( $prepared_site, $request ) {
protected function check_url_is_available( $prepared_site, $request ) {
$id = (int) $request['id'];
$domain = isset( $prepared_site['domain'] ) ? $prepared_site['domain'] : '';
$path = isset( $prepared_site['path'] ) ? $prepared_site['path'] : '/';
Expand Down