Skip to content

fix(clone): allow ee site clone onto a host with no existing sites #501

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

Open
mrrobot47 wants to merge 5 commits into
base: develop
Choose a base branch
from
+31 −8
Open

fix(clone): allow ee site clone onto a host with no existing sites #501

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7c03b93
fix(clone): detect empty destination host in site_exists
mrrobot47 Jul 16, 2026
41aee56
fix(clone): harden empty-host detection after review
mrrobot47 Jul 16, 2026
0f7f0a2
fix(clone): surface unparseable site list in parent-site check
mrrobot47 Sep 24, 2026
4df2cbe
fix(clone): treat an unparseable site list as an error in site_exists
mrrobot47 Sep 24, 2026
be6aab8
fix(clone): accept an int wildcard flag in the parent-site check
mrrobot47 Sep 24, 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
39 changes: 31 additions & 8 deletions src/clone/Cloner.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,16 @@ public function validate_ee_version(): void {
}

public function validate_parent_site_present_on_host( string $site ): void {
$list_result = $this->execute( 'ee site list --format=json' );
$list_result = json_decode( $list_result->stdout, true );
$list_run = $this->execute( 'ee site list --format=json' );
$list_result = json_decode( $list_run->stdout, true );

if ( ! is_array( $list_result ) ) {
// An empty host has no parent to match; any other failure must surface, not be masked as "parent not found".
if ( ! $this->is_no_sites_error( $list_run ) ) {
throw new \Exception( 'Unable to get site list on ' . $this->user . '@' . $this->host );
}
$list_result = [];
}

foreach ( $list_result as $site_details ) {
$parent_site = $site_details['site'];
Expand All @@ -92,7 +100,8 @@ public function validate_parent_site_present_on_host( string $site ): void {
if ( explode( '.', $site, 2 )[1] === $parent_site ) {
$info_result = $this->execute( 'ee site info ' . $parent_site . ' --format=json' );
$info_result = json_decode( $info_result->stdout, true );
if ( $info_result['site_ssl'] !== '' && $info_result['site_ssl_wildcard'] === '1' ) {
// site_ssl_wildcard is int 1 or string '1' depending on the PHP version (PDO SQLite typing).
if ( ! empty( $info_result['site_ssl'] ) && ! empty( $info_result['site_ssl_wildcard'] ) ) {
return;
}
}
Expand Down Expand Up @@ -287,14 +296,23 @@ public function create_site( Site $source_site, $assoc_args ): EE\ProcessRun {
return $new_site;
}

// True when `ee site list` failed specifically because the host has no sites.
// `\EE::error( 'No sites found!' )` exits 1 and writes to stderr (merged into stdout under `ssh -t`).
private function is_no_sites_error( EE\ProcessRun $result ): bool {
if ( 1 !== $result->return_code ) {
return false;
}

$output = trim( preg_replace( '#\\x1b[[][^A-Za-z]*[A-Za-z]#', '', $result->stderr . $result->stdout ) );

return false !== strpos( $output, 'Error: No sites found!' );
}

public function site_exists(): bool {
$site_list = $this->execute( 'ee site list --format=json --no-color' );

if ( 1 === $site_list->return_code ) {
$error = trim ( preg_replace( '#\\x1b[[][^A-Za-z]*[A-Za-z]#', '', $site_list->stdout ) );
if ( 'Error: No sites found!' === $error ) {
return false;
}
if ( $this->is_no_sites_error( $site_list ) ) {
return false;
}

if ( 0 !== $site_list->return_code ) {
Expand All @@ -303,6 +321,11 @@ public function site_exists(): bool {

$sites = json_decode( $site_list->stdout, true );

// Unparseable output must not read as "site doesn't exist": a clone rollback would then delete an existing destination site.
if ( ! is_array( $sites ) ) {
throw new \Exception( 'Unable to get site list on ' . $this->user . '@' . $this->host );
}

foreach ( $sites as $site ) {
if ( $site['site'] === $this->name ) {
if ( 'disabled' === $site['status'] ) {
Expand Down
Loading