Clean up old lock files in the changes controller

src/Api/Controller/Changes.php

@@ -3,7 +3,9 @@
 namespace Kirby\Api\Controller;
 
 use Kirby\Cms\ModelWithContent;
+use Kirby\Content\Lock;
 use Kirby\Content\VersionId;
+use Kirby\Filesystem\F;
 use Kirby\Form\Form;
 
 /**
@@ -18,13 +20,23 @@
  */
 class Changes
 {
+	/**
+	 * Cleans up legacy lock files
+	 */
+	protected static function cleanup(ModelWithContent $model): void
+	{
+		F::remove(Lock::legacyFile($model));
+	}
+
 	/**
 	 * Discards unsaved changes by deleting the changes version
 	 */
 	public static function discard(ModelWithContent $model): array
 	{
 		$model->version(VersionId::changes())->delete('current');
 
+		static::cleanup($model);
+
 		return [
 			'status' => 'ok'
 		];
@@ -41,6 +53,8 @@ public static function publish(ModelWithContent $model, array $input): array
 			input: $input
 		);
 
+		static::cleanup($model);
+
 		// get the changes version
 		$changes = $model->version(VersionId::changes());
 
@@ -77,6 +91,8 @@ public static function save(ModelWithContent $model, array $input): array
 		$changes = $model->version(VersionId::changes());
 		$latest  = $model->version(VersionId::latest());
 
+		static::cleanup($model);
+
 		// combine the new field changes with the
 		// last published state
 		$changes->save(

src/Content/Lock.php

@@ -5,6 +5,7 @@
 use Kirby\Cms\App;
 use Kirby\Cms\Language;
 use Kirby\Cms\Languages;
+use Kirby\Cms\ModelWithContent;
 use Kirby\Cms\User;
 use Kirby\Data\Data;
 use Kirby\Toolkit\Str;
@@ -42,7 +43,7 @@ public static function for(
 		Language|string $language = 'default'
 	): static {
 
-		if ($legacy = static::legacy($version)) {
+		if ($legacy = static::legacy($version->model())) {
 			return $legacy;
 		}
 
@@ -143,12 +144,10 @@ public function isLocked(): bool
 	 * Looks for old .lock files and tries to create a
 	 * usable lock instance from them
 	 */
-	public static function legacy(Version $version): static|null
+	public static function legacy(ModelWithContent $model): static|null
 	{
-		$model = $version->model();
 		$kirby = $model->kirby();
-		$root  = $model::CLASS_ALIAS === 'file' ? dirname($model->root()) : $model->root();
-		$file  = $root . '/.lock';
+		$file  = static::legacyFile($model);
 		$id    = '/' . $model->id();
 
 		// no legacy lock file? no lock.
@@ -175,6 +174,15 @@ public static function legacy(Version $version): static|null
 		);
 	}
 
+	/**
+	 * Returns the absolute path to a legacy lock file
+	 */
+	public static function legacyFile(ModelWithContent $model): string
+	{
+		$root = $model::CLASS_ALIAS === 'file' ? dirname($model->root()) : $model->root();
+		return $root . '/.lock';
+	}
+
 	/**
 	 * Returns the timestamp when the locked content has
 	 * been updated. You can pass a format to get a useful,