feat: Take care of more files and folders in migration

Author: bastianallgeier

src/CLI/Commands/Migrate/To/PublicFolder.php

@@ -39,7 +39,7 @@ public static function command(CLI $cli): void
 	protected static function confirmMigration(CLI $cli): void
 	{
 		$cli->br();
-		$cli->confirmToContinue('💡 Migrating your folder setup can lead to a broken site. Make sure to backup your current installation. If you have modified your index.php you might need to adjust the new index.php after the migration. Do you want to continue?');
+		$cli->confirmToContinue("💡 Migrating your folder setup can lead to a broken site.\n\nMake sure to backup your current installation. If you have modified your index.php you might need to adjust the new index.php after the migration.\n\nDo you want to continue?");
 		$cli->br();
 	}
 
@@ -55,8 +55,8 @@ protected static function makeIndexPHP(CLI $cli, string $publicDir)
 	protected static function makePublicDir(CLI $cli, string $publicDir): void
 	{
 		if (is_dir($publicDir) === true) {
-			$cli->confirmToContinue('The public folder exists. Do you still want to continue?');
-			return;
+			$cli->confirmToContinue('⚠️  The public folder exists. Do you still want to continue?');
+			$cli->br();
 		}
 
 		Dir::make($publicDir);
@@ -67,6 +67,7 @@ protected static function makePublicDir(CLI $cli, string $publicDir): void
 	protected static function movableDirs(string $dir): array
 	{
 		return [
+			$dir . '/.well-known',
 			$dir . '/assets',
 			$dir . '/media',
 		];
@@ -76,6 +77,11 @@ protected static function movableFiles(string $dir): array
 	{
 		return [
 			$dir . '/.htaccess',
+			$dir . '/favicon.ico',
+			$dir . '/favicon.png',
+			$dir . '/favicon.svg',
+			$dir . '/favicon.gif',
+			$dir . '/robots.txt',
 		];
 	}
 
@@ -87,8 +93,21 @@ protected static function moveDirs(CLI $cli, string $destination, array $dirs):
 			}
 
 			$dirname = basename($dir);
+			$target  = $destination . '/' . $dirname;
+
+			// avoid overwriting directories that should not be overwritten
+			if (is_dir($target) === true) {
+				$input = $cli->confirm('⚠️  The directory ' . $dirname . ' exists. Do you want to overwrite it?');
+				$cli->br();
+
+				if ($input->confirmed() === false) {
+					continue;
+				}
+			}
+
+			Dir::remove($target);
 
-			if (Dir::move($dir, $destination . '/' . $dirname) === true) {
+			if (Dir::move($dir, $target) === true) {
 				$cli->out('✅ The ' . $dirname . ' directory has been moved');
 			} else {
 				$cli->out('🚨 The ' . $dirname . ' directory could not be moved');
@@ -104,6 +123,19 @@ protected static function moveFiles(CLI $cli, string $destination, array $files)
 			}
 
 			$filename = basename($file);
+			$target   = $destination . '/' . $filename;
+
+			// avoid overwriting directories that should not be overwritten
+			if (is_dir($target) === true) {
+				$input = $cli->confirm('⚠️  The file ' . $filename . ' exists. Do you want to overwrite it?');
+				$cli->br();
+
+				if ($input->confirmed() === false) {
+					continue;
+				}
+			}
+
+			F::remove($target);
 
 			if (F::move($file, $destination . '/' . $filename) === true) {
 				$cli->out('✅ The ' . $filename . ' file has been moved');

src/CLI/Commands/Migrate/To/RootFolder.php

@@ -6,6 +6,7 @@
 
 use Kirby\CLI\CLI;
 use Kirby\Filesystem\Dir;
+use Kirby\Filesystem\F;
 
 class RootFolder extends PublicFolder
 {
@@ -28,8 +29,11 @@ public static function command(CLI $cli): void
 			return;
 		}
 
-		static::moveDirs($cli, $dir, static::movableDirs($publicDir));
-		static::moveFiles($cli, $dir, static::movableFiles($publicDir));
+		$dirs  = Dir::dirs($publicDir, null, true);
+		$files = Dir::files($publicDir, ['index.php'], true);
+
+		static::moveDirs($cli, $dir, $dirs);
+		static::moveFiles($cli, $dir, $files);
 
 		static::makeIndexPHP($cli, $dir);
 		static::removePublicDir($cli, $publicDir);
@@ -44,11 +48,19 @@ protected static function makeIndexPHP(CLI $cli, string $dir)
 
 		$cli->make($dir . '/index.php', $template);
 
-		$cli->out('✅ The index.php has been created');
+		$cli->out('✅ The new index.php has been created');
+
+		// remove the old index.php
+		F::remove($dir . '/public/index.php');
 	}
 
 	protected static function removePublicDir(CLI $cli, string $publicDir): void
 	{
+		if (Dir::isEmpty($publicDir) === false) {
+			$cli->out('🚨 The public directory is not empty yet. Please make sure to move remaining files and directories yourself.');
+			return;
+		}
+
 		if (Dir::remove($publicDir) === true) {
 			$cli->out('✅ The public directory has been removed');
 		} else {