Dominique.Fournier/DomFramework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

file: update glob function to clean correctely in relative mode

Browse Source 
git-svn-id: https://svn.fournier38.fr/svn/ProgSVN/trunk@3736 bf3deb0d-5f1a-0410-827f-c0cc1f45334c
This commit is contained in:
Dominique Fournier
2017-05-30 08:43:26 +00:00
parent e4e5e5931b
commit 683d5b0a51
2 changed files with 34 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Tests/fileTest.php
View File

@@ -438,4 +438,34 @@ class test_file extends PHPUnit_Framework_TestCase
$res = $file->mkdir ("/testDFFileDir/tptp/titi/poo", 0777, true); $res = $file->mkdir ("/testDFFileDir/tptp/titi/poo", 0777, true);
$this->assertSame ($res, true); $this->assertSame ($res, true);
} }
public function test_glob_1 ()
{
$file = new file ();
$file->chroot ("/tmp");
$res = $file->glob ("/testDFFileDir/*");
$this->assertSame ($res, array ("/testDFFileDir/toto",
"/testDFFileDir/tptp"));
}
public function test_glob_2 ()
{
$file = new file ();
$file->chroot ("/tmp");
$file->chdir ("/testDFFileDir");
$res = $file->glob ("*");
$this->assertSame ($res, array ("toto",
"tptp"));
}
public function test_glob_3 ()
{
$file = new file ();
$file->chroot ("/tmp");
$file->chdir ("/testDFFileDir");
$res = $file->glob ("/testDFFileDir/*");
$this->assertSame ($res, array ("/testDFFileDir/toto",
"/testDFFileDir/tptp"));
}
} }

5
file.php
View File

@@ -257,7 +257,10 @@ class file
throw new \Exception ("Glob : can't read some files", 500); throw new \Exception ("Glob : can't read some files", 500);
foreach ($files as &$file) foreach ($files as &$file)
{ {
$file = substr ($file, strlen ($this->baseDir)+$relative); if ($relative == 1)
$file = substr ($file, strlen ($this->baseDir)+strlen ($this->cwd)+1);
else
$file = substr ($file, strlen ($this->baseDir));
} }
return $files; return $files;
} }