wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #7260 from nextcloud/cleanup-unused-code

Browse source 
Use basename() instead of self implementation
This commit is contained in:
Morris Jobke 2017-11-23 13:07:47 +01:00 committed by GitHub
commit 2f3484ba88
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/private/Files/Cache/Cache.php
View file

@ -259,7 +259,7 @@ class Cache implements ICache {
$data['path'] = $file;
$data['parent'] = $this->getParentId($file);
$data['name'] = \OC_Util::basename($file);
$data['name'] = basename($file);
list($queryParts, $params) = $this->buildParts($data);
$queryParts[] = '`storage`';
@ -551,7 +551,7 @@ class Cache implements ICache {
}
$sql = 'UPDATE `*PREFIX*filecache` SET `storage` = ?, `path` = ?, `path_hash` = ?, `name` = ?, `parent` = ? WHERE `fileid` = ?';
$this->connection->executeQuery($sql, array($targetStorageId, $targetPath, md5($targetPath), \OC_Util::basename($targetPath), $newParentId, $sourceId));
$this->connection->executeQuery($sql, array($targetStorageId, $targetPath, md5($targetPath), basename($targetPath), $newParentId, $sourceId));
$this->connection->commit();
} else {
$this->moveFromCacheFallback($sourceCache, $sourcePath, $targetPath);

10
lib/private/legacy/util.php
View file

@ -1407,16 +1407,6 @@ class OC_Util {
return $normalizedValue;
}
/**
* @param boolean|string $file
* @return string
*/
public static function basename($file) {
$file = rtrim($file, '/');
$t = explode('/', $file);
return array_pop($t);
}
/**
* A human readable string is generated based on version and build number
*

18
tests/lib/UtilTest.php
View file

@ -177,24 +177,6 @@ class UtilTest extends \Test\TestCase {
$this->assertSame(1, $matchesRegex);
}
/**
* @dataProvider baseNameProvider
*/
public function testBaseName($expected, $file) {
$base = \OC_Util::basename($file);
$this->assertEquals($expected, $base);
}
public function baseNameProvider() {
return array(
array('public_html', '/home/user/public_html/'),
array('public_html', '/home/user/public_html'),
array('', '/'),
array('public_html', 'public_html'),
array('442aa682de2a64db1e010f50e60fd9c9', 'local::C:\Users\ADMINI~1\AppData\Local\Temp\2/442aa682de2a64db1e010f50e60fd9c9/')
);
}
/**
* @dataProvider filenameValidationProvider
*/