Handle state updates in the ModelWithContent::save method

Author: bastianallgeier

src/Cms/FileActions.php

@@ -400,26 +400,6 @@ public function replace(string $source, bool $move = false): static
 		});
 	}
 
-	/**
-	 * Stores the content on disk
-	 * @internal
-	 */
-	public function save(
-		array|null $data = null,
-		string|null $languageCode = null,
-		bool $overwrite = false
-	): static {
-		$file = parent::save($data, $languageCode, $overwrite);
-
-		ModelState::update(
-			method: 'set',
-			current: $this,
-			next: $file
-		);
-
-		return $file;
-	}
-
 	/**
 	 * Remove all public versions of this file
 	 *

src/Cms/ModelWithContent.php

@@ -452,6 +452,12 @@ public function save(
 			$overwrite
 		);
 
+		ModelState::update(
+			method: 'set',
+			current: $this,
+			next: $clone
+		);
+
 		return $clone;
 	}
 

src/Cms/PageActions.php

@@ -808,26 +808,6 @@ public function resortSiblingsAfterUnlisting(): bool
 		return true;
 	}
 
-	/**
-	 * Stores the content on disk
-	 * @internal
-	 */
-	public function save(
-		array|null $data = null,
-		string|null $languageCode = null,
-		bool $overwrite = false
-	): static {
-		$page = parent::save($data, $languageCode, $overwrite);
-
-		ModelState::update(
-			method: 'set',
-			current: $this,
-			next: $page
-		);
-
-		return $page;
-	}
-
 	/**
 	 * Convert a page from listed or
 	 * unlisted to draft.