Merge branch 'develop' into fix/postfix-configuration

Author: kirtangajjar

src/WordPress.php

@@ -262,7 +262,7 @@ public function create( $args, $assoc_args ) {
 		$this->logger->debug( 'args:', $args );
 		$this->logger->debug( 'assoc_args:', empty( $assoc_args ) ? array( 'NULL' ) : $assoc_args );
 		$this->site_data['site_url']  = strtolower( \EE\Utils\remove_trailing_slash( $args[0] ) );
-		$this->site_data['subnet_ip'] = \EE\Site\Utils\get_subnet_ip();
+		$this->site_data['subnet_ip'] = \EE\Site\Utils\get_available_subnet();
 
 		$mu                              = \EE\Utils\get_flag_value( $assoc_args, 'mu' );
 		$this->site_data['app_sub_type'] = $mu ?? 'wp';
@@ -344,12 +344,7 @@ public function create( $args, $assoc_args ) {
 		}
 
 		$this->site_data['site_container_fs_path'] = get_public_dir( $assoc_args );
-		$this->site_data['site_ssl']               = get_value_if_flag_isset( $assoc_args, 'ssl', [
-			'le',
-			'self',
-			'inherit',
-			'custom'
-		], 'le' );
+		$this->site_data['site_ssl']               = get_value_if_flag_isset( $assoc_args, 'ssl', 'le' );
 		if ( 'custom' === $this->site_data['site_ssl'] ) {
 			try {
 				$this->validate_site_custom_ssl( get_flag_value( $assoc_args, 'ssl-key' ), get_flag_value( $assoc_args, 'ssl-crt' ) );
@@ -1448,11 +1443,16 @@ protected function update_ssl( $assoc_args ) {
 
 		$extra_flags = '--precise';
 		$extra_flags .= ( 'wp' === $this->site_data['app_sub_type'] ) ? '' : ' --network';
-		EE::exec( sprintf( \EE_DOCKER::docker_compose_with_custom() . ' exec php wp search-replace http://%1$s https://%1$s %2$s', $this->site_data['site_url'], $extra_flags ), true, true );
+
+		$ssl  = get_flag_value( $assoc_args, 'ssl' );
+		$from = $ssl === 'off' ? 'https' : 'http';
+		$to   = $ssl === 'off' ? 'http' : 'https';
+
+		EE::exec( sprintf( \EE_DOCKER::docker_compose_with_custom() . ' exec php wp search-replace %2$s://%1$s %3$s://%1$s %4$s', $this->site_data['site_url'], $from, $to, $extra_flags ), true, true );
 		EE::success( 'Successfully completed search-replace.' );
 
 		if ( $backup_success ) {
-			EE::log( "In case something is not working as intended. You can restore your DB from backup file generated before search-replace located at:\n `$backup_location`\nand proceed with search-replace according to your needs." );
+			EE::log( "In case something is not working as intended, you can restore your DB from backup file generated before search-replace located at:\n `$backup_location`\nand proceed with search-replace according to your needs." );
 		}
 	}