Merge pull request #31758 from nextcloud/fix/utf8-detection-fix

Use sabre function directly rather than duplicating it
nextcloud · Apr 29, 2022 · 033d527 · 033d527
2 parents 8367b02 + 9cfc70d
commit 033d527
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 12 deletions.
diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml
@@ -2537,7 +2537,8 @@
     <RedundantCondition occurrences="1">
       <code>\is_array($params)</code>
     </RedundantCondition>
-    <UndefinedFunction occurrences="1">
+    <UndefinedFunction occurrences="2">
+      <code>\Sabre\HTTP\decodePath($pathInfo)</code>
       <code>\Sabre\Uri\split($scriptName)</code>
     </UndefinedFunction>
   </file>

diff --git a/lib/private/AppFramework/Http/Request.php b/lib/private/AppFramework/Http/Request.php
@@ -784,17 +784,7 @@ public function getRawPathInfo(): string {
 	 */
 	public function getPathInfo() {
 		$pathInfo = $this->getRawPathInfo();
-		// following is taken from \Sabre\HTTP\URLUtil::decodePathSegment
-		$pathInfo = rawurldecode($pathInfo);
-		$encoding = mb_detect_encoding($pathInfo, ['UTF-8', 'ISO-8859-1']);
-
-		switch ($encoding) {
-			case 'ISO-8859-1':
-				$pathInfo = utf8_encode($pathInfo);
-		}
-		// end copy
-
-		return $pathInfo;
+		return \Sabre\HTTP\decodePath($pathInfo);
 	}
 
 	/**