mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
BUG Fix incorrect convert slashes argument
This commit is contained in:
parent
833b600018
commit
0b7cf80331
@ -605,6 +605,6 @@ class Convert
|
|||||||
if ($multiple) {
|
if ($multiple) {
|
||||||
return preg_replace('#[/\\\\]+#', $separator, $path);
|
return preg_replace('#[/\\\\]+#', $separator, $path);
|
||||||
}
|
}
|
||||||
return str_replace(['/', '\\'], DIRECTORY_SEPARATOR, $path);
|
return str_replace(['/', '\\'], $separator, $path);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -259,7 +259,7 @@ PHP
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Tests {@link Convert::testRaw2URL()}
|
* Tests {@link Convert::testRaw2URL()}
|
||||||
*
|
*
|
||||||
* @todo test toASCII()
|
* @todo test toASCII()
|
||||||
*/
|
*/
|
||||||
public function testRaw2URL()
|
public function testRaw2URL()
|
||||||
@ -273,7 +273,7 @@ PHP
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Helper function for comparing characters with significant whitespaces
|
* Helper function for comparing characters with significant whitespaces
|
||||||
*
|
*
|
||||||
* @param string $expected
|
* @param string $expected
|
||||||
* @param string $actual
|
* @param string $actual
|
||||||
*/
|
*/
|
||||||
@ -590,7 +590,7 @@ XML
|
|||||||
/**
|
/**
|
||||||
* Test that bytes2memstring returns a binary prefixed string representing the number of bytes
|
* Test that bytes2memstring returns a binary prefixed string representing the number of bytes
|
||||||
*
|
*
|
||||||
* @param string $memString
|
* @param string $bytes
|
||||||
* @param int $expected
|
* @param int $expected
|
||||||
* @dataProvider bytes2MemStringProvider
|
* @dataProvider bytes2MemStringProvider
|
||||||
*/
|
*/
|
||||||
@ -613,4 +613,40 @@ XML
|
|||||||
[(512 * 1024 * 1024 * 1024 * 1024 * 1024), '512P']
|
[(512 * 1024 * 1024 * 1024 * 1024 * 1024), '512P']
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function providerTestSlashes()
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
['bob/bob', '/', true, 'bob/bob'],
|
||||||
|
['\\bob/bob\\', '/', true, '/bob/bob/'],
|
||||||
|
['\\bob////bob\\/', '/', true, '/bob/bob/'],
|
||||||
|
['bob/bob', '\\', true, 'bob\\bob'],
|
||||||
|
['\\bob/bob\\', '\\', true, '\\bob\\bob\\'],
|
||||||
|
['\\bob////bob\\/', '\\', true, '\\bob\\bob\\'],
|
||||||
|
['bob/bob', '#', true, 'bob#bob'],
|
||||||
|
['\\bob/bob\\', '#', true, '#bob#bob#'],
|
||||||
|
['\\bob////bob\\/', '#', true, '#bob#bob#'],
|
||||||
|
['bob/bob', '/', false, 'bob/bob'],
|
||||||
|
['\\bob/bob\\', '/', false, '/bob/bob/'],
|
||||||
|
['\\bob////bob\\/', '/', false, '/bob////bob//'],
|
||||||
|
['bob/bob', '\\', false, 'bob\\bob'],
|
||||||
|
['\\bob/bob\\', '\\', false, '\\bob\\bob\\'],
|
||||||
|
['\\bob////bob\\/', '\\', false, '\\bob\\\\\\\\bob\\\\'],
|
||||||
|
['bob/bob', '#', false, 'bob#bob'],
|
||||||
|
['\\bob/bob\\', '#', false, '#bob#bob#'],
|
||||||
|
['\\bob////bob\\/', '#', false, '#bob####bob##'],
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @dataProvider providerTestSlashes
|
||||||
|
* @param string $path
|
||||||
|
* @param string $separator
|
||||||
|
* @param bool $multiple
|
||||||
|
* @param string $expected
|
||||||
|
*/
|
||||||
|
public function testSlashes($path, $separator, $multiple, $expected)
|
||||||
|
{
|
||||||
|
$this->assertEquals($expected, Convert::slashes($path, $separator, $multiple));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user