Merge pull request #40158 from owncloud/utf8_encode-mb_convert_encoding

phil-davis · web-flow · commit 89c6b034ce95 · 2022-06-21T16:59:42.000+05:45
[full-ci] Convert from utf8_encode to mb_convert_encoding
diff --git a/changelog/unreleased/40158 b/changelog/unreleased/40158
@@ -0,0 +1,6 @@
+Bugfix: Convert from utf8_encode to mb_convert_encoding
+
+Function `utf8_encode` will be deprecated and removed in future PHP versions.
+It has been replaced with function mb_convert_encoding.
+
+https://github.com/owncloud/core/pull/40158
diff --git a/lib/private/AppFramework/Http/Request.php b/lib/private/AppFramework/Http/Request.php
@@ -689,15 +689,13 @@ 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);
+				$pathInfo = \mb_convert_encoding($pathInfo, 'UTF-8', $encoding);
 		}
-		// end copy
 
 		return $pathInfo;
 	}
diff --git a/tests/lib/AppFramework/Http/RequestTest.php b/tests/lib/AppFramework/Http/RequestTest.php
@@ -1280,9 +1280,15 @@ public function testGetPathInfoWithoutSetEnvGeneric($requestUri, $scriptName, $e
 	 * @dataProvider genericPathInfoProvider
 	 * @param string $requestUri
 	 * @param string $scriptName
-	 * @param string $expected
+	 * @param string $expectedGetPathInfo
+	 * @param string $expectedGetRawPathInfo
 	 */
-	public function testGetRawPathInfoWithoutSetEnvGeneric($requestUri, $scriptName, $expected) {
+	public function testGetRawPathInfoWithoutSetEnvGeneric($requestUri, $scriptName, $expectedGetPathInfo, $expectedGetRawPathInfo) {
+		if ($expectedGetRawPathInfo === '') {
+			$expected = $expectedGetPathInfo;
+		} else {
+			$expected = $expectedGetRawPathInfo;
+		}
 		$request = new Request(
 			[
 				'server' => [
@@ -1350,14 +1356,15 @@ public function testGetPathInfoWithoutSetEnv($requestUri, $scriptName, $expected
 	 */
 	public function genericPathInfoProvider() {
 		return [
-			['/core/index.php?XDEBUG_SESSION_START=14600', '/core/index.php', ''],
-			['/index.php/apps/files/', 'index.php', '/apps/files/'],
-			['/index.php/apps/files/../&amp;/&?someQueryParameter=QueryParam', 'index.php', '/apps/files/../&amp;/&'],
-			['/remote.php/漢字編碼方法 / 汉字编码方法', 'remote.php', '/漢字編碼方法 / 汉字编码方法'],
-			['///removeTrailin//gSlashes///', 'remote.php', '/removeTrailin/gSlashes/'],
-			['/remove/multiple/Slashes/In/ScriptName/', '//remote.php', '/remove/multiple/Slashes/In/ScriptName/'],
-			['/', '/', ''],
-			['', '', ''],
+			['/core/index.php?XDEBUG_SESSION_START=14600', '/core/index.php', '', ''],
+			['/index.php/apps/files/', 'index.php', '/apps/files/', ''],
+			['/index.php/apps/files/../&amp;/&?someQueryParameter=QueryParam', 'index.php', '/apps/files/../&amp;/&', ''],
+			['/remote.php/漢字編碼方法 / 汉字编码方法', 'remote.php', '/漢字編碼方法 / 汉字编码方法', ''],
+			['/remote.php/pound-cent-AE-%A3%A2%C6-in-ISO-8859-1', 'remote.php', '/pound-cent-AE-£¢Æ-in-ISO-8859-1', '/pound-cent-AE-%A3%A2%C6-in-ISO-8859-1'],
+			['///removeTrailin//gSlashes///', 'remote.php', '/removeTrailin/gSlashes/', ''],
+			['/remove/multiple/Slashes/In/ScriptName/', '//remote.php', '/remove/multiple/Slashes/In/ScriptName/', ''],
+			['/', '/', '', ''],
+			['', '', '', ''],
 		];
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -689,15 +689,13 @@ public function getPathInfo() {`
`689`	`689`	`}`
`690`	`690`
`691`	`691`	`$pathInfo = $this->getRawPathInfo();`
`692`		`- // following is taken from \Sabre\HTTP\URLUtil::decodePathSegment`
`693`	`692`	`$pathInfo = \rawurldecode($pathInfo);`
`694`	`693`	`$encoding = \mb_detect_encoding($pathInfo, ['UTF-8', 'ISO-8859-1']);`
`695`	`694`
`696`	`695`	`switch ($encoding) {`
`697`	`696`	`case 'ISO-8859-1':`
`698`		`- $pathInfo = \utf8_encode($pathInfo);`
	`697`	`+ $pathInfo = \mb_convert_encoding($pathInfo, 'UTF-8', $encoding);`
`699`	`698`	`}`
`700`		`- // end copy`
`701`	`699`
`702`	`700`	`return $pathInfo;`
`703`	`701`	`}`