smarty-php/smarty
1
0
Fork 0
mirror of https://github.com/smarty-php/smarty.git synced 2025-08-04 18:34:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update path normalization

Browse Source
This commit is contained in:
Uwe Tews
2015-06-18 00:17:57 +02:00
parent c1d6ae68f4
commit e5b3da5b38
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/PHPUnit_Smarty.php
View File

@@ -74,9 +74,6 @@ class PHPUnit_Smarty extends PHPUnit_Framework_TestCase
'PHPUnit_Smarty' => array('config', 'pdo', 'init'), 'PHPUnit_Smarty' => array('config', 'pdo', 'init'),
); );
private $dsMap = array('/' => array(array('\\', '/./'), '/.'),
'\\' => array(array('/', '\\.\\'), '\\.'),
);
/** /**
* This method is called before the first test of this test class is run. * This method is called before the first test of this test class is run.
@@ -372,9 +369,9 @@ KEY `expire` (`expire`)
if ($path[0] == '.') { if ($path[0] == '.') {
$path = getcwd() . DS . $path; $path = getcwd() . DS . $path;
} }
$path = str_replace($this->dsMap[DS][0], DS, $path); $path = preg_replace('#[\\\/]+([.][\\\/]+)*([.](?![.]))?#', DS, $path);
while (strrpos($path, $this->dsMap[DS][1]) !== false) { while (strrpos($path, DS . '.') !== false) {
$path = preg_replace('#([\\\/][.][\\\/])|([\\\/][^\\\/]+[\\\/][.][.][\\\/])#', DS, $path); $path = preg_replace('#([\\\/]([^\\\/]+[\\\/]){2}([.][.][\\\/]){2})|([\\\/][^\\\/]+[\\\/][.][.][\\\/]?)#', DS, $path);
} }
return $path; return $path;
} }