refact: Clean up all UUIDs in a single loop after they’ve been collected

Author: bastianallgeier

src/CLI/Commands/UUID/Duplicates.php

@@ -22,20 +22,10 @@ protected static function check(CLI $cli, ModelWithContent $model, array &$uuids
 
 		// the UUID already exists for another model
 		if (isset($uuids[$uuid])) {
-			$duplicates[] = $uuid;
-
-			if ($cli->arg('fix') === true) {
-
-				// regenerate the UUID for the first model
-				static::regenerate($uuids[$uuid]);
-
-				// regenerate the UUID for this model
-				static::regenerate($model);
-
-				$cli->out('✅ The duplicate UUID ' . $uuid . ' for ' . $model->id() . ' has been regenerated');
-			} else {
-				$cli->error('The UUID ' . $uuid . ' for ' . $model->id() . ' exists (' . $uuids[$uuid] . ')');
-			}
+			// add this model and the one with the duplicate uuid
+			// to the duplicates array to clean them up later
+			$duplicates[] = $model;
+			$duplicates[] = $uuids[$uuid];
 		}
 
 		$uuids[$uuid] = $model;
@@ -81,14 +71,34 @@ public static function command(CLI $cli): void
 			}
 		}
 
-		if (count($uuids) === 0) {
+		// remove duplicates from duplicates array
+		$duplicates = array_unique($duplicates);
+
+		if (count($duplicates) === 0) {
 			$cli->success('There are no UUID duplicates');
-		} elseif ($fix === true) {
+			return;
+		}
+
+		// go through all collected models with duplicate UUIDs
+		// and print info or fix them.
+		foreach ($duplicates as $model) {
+			$uuid = $model->uuid()->toString();
+
+			if ($fix === true) {
+				static::regenerate($model);
+				$cli->out('✅ The duplicate UUID ' . $uuid . ' for ' . $model->id() . ' has been regenerated');
+			} else {
+				$cli->error('The UUID ' . $uuid . ' for ' . $model->id() . ' exists');
+			}
+		}
+
+		if ($fix === true) {
 			$cli->success(count($duplicates) . ' duplicates have been fixed');
-		} else {
-			$cli->out(count($duplicates) . ' duplicates! You can fix them with kirby uuid:duplicates --fix');
-			exit(1);
+			return;
 		}
+
+		$cli->out(count($duplicates) . ' duplicates! You can fix them with kirby uuid:duplicates --fix');
+		exit(1);
 	}
 
 	protected static function regenerate(ModelWithContent $model): void