From cf4d8043d2076ba346e9890a41984d458e94c8dc Mon Sep 17 00:00:00 2001
From: Inverle <inverle@proton.me>
Date: Sun, 16 Nov 2025 18:42:27 +0100
Subject: Rework saving of configuration files (#8220)

* Attempt to restore user config if `file_put_contents()` fails

* Second approach

* Minor preference: `.tmp.php`

Co-authored-by: Alexandre Alapetite <alexandre@alapetite.fr>

* Change boolean compare syntax

Co-authored-by: Alexandre Alapetite <alexandre@alapetite.fr>

* fix?
---
 lib/Minz/Configuration.php | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/Minz/Configuration.php b/lib/Minz/Configuration.php
index 0d6c8b1f3..e0480b414 100644
--- a/lib/Minz/Configuration.php
+++ b/lib/Minz/Configuration.php
@@ -210,14 +210,22 @@ class Minz_Configuration {
 	 * Save the current configuration in the configuration file.
 	 */
 	public function save(): bool {
+		$tmp_filename = $this->config_filename . '.tmp.php';
 		$back_filename = $this->config_filename . '.bak.php';
-		@rename($this->config_filename, $back_filename);
 
-		if (file_put_contents($this->config_filename,
-			"<?php\nreturn " . var_export($this->data, true) . ';', LOCK_EX) === false) {
+		if (!file_put_contents($tmp_filename,
+			"<?php\nreturn " . var_export($this->data, true) . ';', LOCK_EX)) {
+			@unlink($tmp_filename);
 			return false;
 		}
 
+		if (!copy($this->config_filename, $back_filename)) {
+			@unlink($tmp_filename);
+			return false;
+		}
+
+		@rename($tmp_filename, $this->config_filename);
+
 		// Clear PHP cache for include
 		if (function_exists('opcache_invalidate')) {
 			opcache_invalidate($this->config_filename);
-- 
cgit v1.2.3