tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #7270 from robbieaverill/pulls/3.6/fix-trailing-period-on-duplicate-folder-name

Browse Source 
FIX Files without extensions (folders) do not have a trailing period added
This commit is contained in:
Damian Mooyman 2017-10-18 10:26:05 +13:00 committed by GitHub
commit 2b09216b0c
2 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
filesystem/File.php
View File

@ -634,7 +634,7 @@ class File extends DataObject {
*
* Does not change the filesystem itself, please use {@link write()} for this.
*
* @param String $name
* @param string $name
*/
public function setName($name) {
$oldName = $this->Name;
@ -663,7 +663,10 @@ class File extends DataObject {
))->first()
) {
$suffix++;
$name = "$base-$suffix.$ext";
$name = "$base-$suffix";
if (!empty($ext)) {
$name .= ".$ext";
}
}
}

24
tests/filesystem/FileTest.php
View File

@ -187,6 +187,30 @@ class FileTest extends SapphireTest {
}
}
/**
* Uses fixtures Folder.folder1 and File.setfromname
* @dataProvider setNameFileProvider
*/
public function testSetNameAddsUniqueSuffixWhenFilenameAlreadyExists($name, $expected)
{
$duplicate = new Folder;
$duplicate->setName($name);
$duplicate->write();
$this->assertSame($expected, $duplicate->Name);
}
/**
* @return array[]
*/
public function setNameFileProvider()
{
return array(
array('FileTest-folder1', 'FileTest-folder1-2'),
array('FileTest.png', 'FileTest-2.png'),
);
}
public function testLinkAndRelativeLink() {
$file = $this->objFromFixture('File', 'asdf');
$this->assertEquals(ASSETS_DIR . '/FileTest.txt', $file->RelativeLink());