Add sorting to the file iterator to keep consistency in different sit…

…uations

APP_VERSION

@@ -1 +1 @@
-1.0.11
+1.0.13

src/Lib/FileSortingIterator.php

@@ -0,0 +1,35 @@
+<?php declare(strict_types=1);
+
+/*
+  Copyright (c) 2023, Manticore Software LTD (https://manticoresearch.com)
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License version 2 or any later
+  version. You should have received a copy of the GPL license along with this
+  program; if you did not, you can find it at http://www.gnu.org/
+*/
+
+namespace Manticoresearch\Backup\Lib;
+
+use Iterator;
+use SplFileInfo;
+use SplHeap;
+
+/** @phpstan-ignore-next-line */
+final class FileSortingIterator extends SplHeap {
+	/**
+	 * @param Iterator<SplFileInfo> $iterator [description]
+	 * @return void
+	 */
+	public function __construct(Iterator $iterator) {
+		foreach ($iterator as $item) {
+			$this->insert($item);
+		}
+	}
+
+	public function compare(mixed $b, mixed $a): int {
+		/** @var SplFileInfo $a */
+		/** @var SplFileInfo $b */
+		return strcmp($a->getRealpath(), $b->getRealpath());
+	}
+}

src/Lib/FileStorage.php

@@ -537,16 +537,18 @@ public function cleanUp(): void {
    * @param string $dir
    *  The directory where we should look into
    * @param int $flags
-   * @return \RecursiveIteratorIterator<\RecursiveDirectoryIterator>
+   * @return FileSortingIterator<\RecursiveDirectoryIterator>
    */
 	public static function getFileIterator(
 		string $dir,
 		int $flags = \FilesystemIterator::KEY_AS_PATHNAME | \FilesystemIterator::CURRENT_AS_FILEINFO
-	): \RecursiveIteratorIterator {
-		return new \RecursiveIteratorIterator(
+	): FileSortingIterator {
+		$iterator = new \RecursiveIteratorIterator(
 			new \RecursiveDirectoryIterator($dir, $flags),
 			\RecursiveIteratorIterator::CHILD_FIRST
 		);
+
+		return new FileSortingIterator($iterator);
 	}
 
 	/**