mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #24940 from owncloud/fix-normalizedcachekey-keepunicode 

Add keepUnicode value in the cache key of normalizedPathCache
This commit is contained in:
Vincent Petry 2016-06-02 15:18:13 +02:00
parent 53398b5146 5b1eb416d8
commit 1ab7ee5e23
3 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/private/Files/Filesystem.php
View File

@ -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];

27
tests/lib/Files/FilesystemTest.php
View File

@ -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),

7
tests/lib/TestCase.php
View File

@ -166,7 +166,12 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase {
* @return mixed
*/
protected static function invokePrivate($object, $methodName, array $parameters = array()) {
$reflection = new \ReflectionClass(get_class($object));
if (is_string($object)) {
$className = $object;
} else {
$className = get_class($object);
}
$reflection = new \ReflectionClass($className);
if ($reflection->hasMethod($methodName)) {
$method = $reflection->getMethod($methodName);