diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2016-06-01 12:20:38 +0200 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2016-06-01 14:28:59 +0200 |
| commit | 5ad8fa76756801eee2aac18459aed60d03b4d4bc (patch) | |
| tree | e5582d056b8ad473333292c2da6777dbf9868c19 | |
| parent | 7b4459d28d40523c70ec05a733e158f2c14faac4 (diff) | |
| download | nextcloud-server-5ad8fa76756801eee2aac18459aed60d03b4d4bc.tar.gz nextcloud-server-5ad8fa76756801eee2aac18459aed60d03b4d4bc.zip | |
Add keepUnicode value in the cache key of normalizedPathCache
| -rw-r--r-- | lib/private/Files/Filesystem.php | 2 | ||||
| -rw-r--r-- | tests/lib/Files/FilesystemTest.php | 27 |
2 files changed, 28 insertions, 1 deletions
diff --git a/lib/private/Files/Filesystem.php b/lib/private/Files/Filesystem.php index 08621d160be..3d3345a5c80 100644 --- a/lib/private/Files/Filesystem.php +++ b/lib/private/Files/Filesystem.php @@ -781,7 +781,7 @@ class Filesystem { */ $path = (string)$path; - $cacheKey = json_encode([$path, $stripTrailingSlash, $isAbsolutePath]); + $cacheKey = json_encode([$path, $stripTrailingSlash, $isAbsolutePath, $keepUnicode]); if (isset(self::$normalizedPathCache[$cacheKey])) { return self::$normalizedPathCache[$cacheKey]; diff --git a/tests/lib/Files/FilesystemTest.php b/tests/lib/Files/FilesystemTest.php index a4a4345d2f9..76e3f471633 100644 --- a/tests/lib/Files/FilesystemTest.php +++ b/tests/lib/Files/FilesystemTest.php @@ -92,6 +92,7 @@ class FilesystemTest extends \Test\TestCase { } $this->logout(); + $this->invokePrivate('\OC\Files\Filesystem', 'normalizedPathCache', [null]); parent::tearDown(); } @@ -190,6 +191,32 @@ class FilesystemTest extends \Test\TestCase { $this->assertEquals($expected, \OC\Files\Filesystem::normalizePath($path, $stripTrailingSlash)); } + public function normalizePathKeepUnicodeData() { + $nfdName = 'ümlaut'; + $nfcName = 'ümlaut'; + return [ + ['/' . $nfcName, $nfcName, true], + ['/' . $nfcName, $nfcName, false], + ['/' . $nfdName, $nfdName, true], + ['/' . $nfcName, $nfdName, false], + ]; + } + + /** + * @dataProvider normalizePathKeepUnicodeData + */ + public function testNormalizePathKeepUnicode($expected, $path, $keepUnicode = false) { + $this->assertEquals($expected, \OC\Files\Filesystem::normalizePath($path, true, false, $keepUnicode)); + } + + public function testNormalizePathKeepUnicodeCache() { + $nfdName = 'ümlaut'; + $nfcName = 'ümlaut'; + // call in succession due to cache + $this->assertEquals('/' . $nfcName, \OC\Files\Filesystem::normalizePath($nfdName, true, false, false)); + $this->assertEquals('/' . $nfdName, \OC\Files\Filesystem::normalizePath($nfdName, true, false, true)); + } + public function isValidPathData() { return array( array('/', true), |