Merge pull request #596 from nextcloud/backport/595/stable30

[stable30] fix(versions): Fix strict trimming of version paths

CHANGELOG.md

@@ -5,6 +5,10 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## 1.20.1 – 2024-09-12
+### Fixed
+- fix(versions): Fix compatibility with files_versions and PHP strict types
+
 ## 1.20.0 – 2024-07-30
 ### Changed
 - Require Nextcloud 30

appinfo/info.xml

@@ -17,7 +17,7 @@ An example would be to deny access to MS Excel/XLSX files owned by the "Human Re
 
 Learn more about File Access Control on [https://nextcloud.com/workflow](https://nextcloud.com/workflow)</description>
 
-	<version>1.20.0</version>
+	<version>1.20.1</version>
 	<licence>agpl</licence>
 	<author>Arthur Schiwon</author>
 	<author>Joas Schilling</author>

lib/Operation.php

@@ -134,7 +134,10 @@ protected function translatePath(IStorage $storage, string $path): string {
 		[$folder, $innerPath] = explode('/', $path, 2);
 
 		if ($folder === 'files_versions') {
-			$innerPath = substr($innerPath, 0, strrpos($innerPath, '.v'));
+			if (preg_match('/.+\.v\d{10}$/', basename($innerPath))) {
+				// Remove trailing ".v{timestamp}"
+				$innerPath = substr($innerPath, 0, -12);
+			}
 			return 'files/' . $innerPath;
 		} elseif ($folder === 'thumbnails') {
 			[$fileId,] = explode('/', $innerPath, 2);

tests/psalm-baseline.xml

@@ -18,9 +18,6 @@
     <MissingDependency>
       <code><![CDATA[StorageWrapper]]></code>
     </MissingDependency>
-    <PossiblyFalseArgument>
-      <code><![CDATA[strrpos($innerPath, '.v')]]></code>
-    </PossiblyFalseArgument>
     <PossiblyUndefinedArrayOffset>
       <code><![CDATA[$innerPath]]></code>
     </PossiblyUndefinedArrayOffset>