Check for non-numeric versions, not non-integer

come-nc · come-nc · commit a6b1d990a420 · 2023-04-05T17:50:45.000+02:00
All versions are string

Signed-off-by: Côme Chilliet &lt;come.chilliet@nextcloud.com&gt;
diff --git a/apps/files_versions/lib/Storage.php b/apps/files_versions/lib/Storage.php
@@ -716,13 +716,13 @@ protected static function getExpireList($time, $versions, $quotaExceeded = false
 		}
 
 		foreach ($versions as $key => $version) {
-			if (!is_int($version['version'])) {
+			if (!is_numeric($version['version'])) {
 				\OC::$server->get(LoggerInterface::class)->error(
 					'Found a non-numeric timestamp version: '. json_encode($version),
 					['app' => 'files_versions']);
 				continue;
 			}
-			if ($expiration->isExpired($version['version'], $quotaExceeded) && !isset($toDelete[$key])) {
+			if ($expiration->isExpired((int)($version['version']), $quotaExceeded) && !isset($toDelete[$key])) {
 				$size += $version['size'];
 				$toDelete[$key] = $version['path'] . '.v' . $version['version'];
 			}

Original file line number	Diff line number	Diff line change
`@@ -716,13 +716,13 @@ protected static function getExpireList($time, $versions, $quotaExceeded = false`
`716`	`716`	`}`
`717`	`717`
`718`	`718`	`foreach ($versions as $key => $version) {`
`719`		`- if (!is_int($version['version'])) {`
	`719`	`+ if (!is_numeric($version['version'])) {`
`720`	`720`	`\OC::$server->get(LoggerInterface::class)->error(`
`721`	`721`	`'Found a non-numeric timestamp version: '. json_encode($version),`
`722`	`722`	`['app' => 'files_versions']);`
`723`	`723`	`continue;`
`724`	`724`	`}`
`725`		`- if ($expiration->isExpired($version['version'], $quotaExceeded) && !isset($toDelete[$key])) {`
	`725`	`+ if ($expiration->isExpired((int)($version['version']), $quotaExceeded) && !isset($toDelete[$key])) {`
`726`	`726`	`$size += $version['size'];`
`727`	`727`	`$toDelete[$key] = $version['path'] . '.v' . $version['version'];`
`728`	`728`	`}`