diff options
| author | Martin <martin.mattel@diemattels.at> | 2015-09-21 15:09:28 +0300 |
|---|---|---|
| committer | root <martin.mattel@diemattels.at> | 2015-09-22 18:53:15 +0300 |
| commit | 491250320a6b19f9a7d546598e97eac1e90f78f7 (patch) | |
| tree | 1021d069627a22699713f5c75eba17dac97f734c /tests | |
| parent | 7222e5fb4d8e165733fac4ac9c85e471c0d34fb7 (diff) | |
Replaces if ($file === '.' || $file === '..') by if(\OC\Files\Filesystem::isIgnoredDir($file)). Eases to find where this operation is used.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/lib/files/storage/wrapper/jail.php | 2 | ||||
| -rw-r--r-- | tests/lib/testcase.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/lib/files/storage/wrapper/jail.php b/tests/lib/files/storage/wrapper/jail.php index a7bd684df44..9b16bc5a321 100644 --- a/tests/lib/files/storage/wrapper/jail.php +++ b/tests/lib/files/storage/wrapper/jail.php @@ -30,7 +30,7 @@ class Jail extends \Test\Files\Storage\Storage { $contents = array(); $dh = $this->sourceStorage->opendir(''); while ($file = readdir($dh)) { - if ($file !== '.' and $file !== '..') { + if (!\OC\Files\Filesystem::isIgnoredDir($file)) { $contents[] = $file; } } diff --git a/tests/lib/testcase.php b/tests/lib/testcase.php index 854d5f4f65b..7e4890a46c2 100644 --- a/tests/lib/testcase.php +++ b/tests/lib/testcase.php @@ -193,7 +193,7 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase { static protected function tearDownAfterClassCleanStrayDataUnlinkDir($dir) { if ($dh = @opendir($dir)) { while (($file = readdir($dh)) !== false) { - if ($file === '..' || $file === '.') { + if (\OC\Files\Filesystem::isIgnoredDir($file)) { continue; } $path = $dir . '/' . $file; |