mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-01-13 22:44:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-5.4'

Browse Source
This commit is contained in:
Lars Strojny 2012-09-18 23:17:31 +02:00
commit 6793e09a4e
3 changed files with 123 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
ext/spl/tests/RecursiveDirectoryIterator_getSubPath_basic.phpt Normal file
View File

@ -0,0 +1,52 @@
--TEST--
RecursiveDirectoryIterator::getBasePath() - basic test
--CREDITS--
Pawel Krynicki <pawel [dot] krynicki [at] xsolve [dot] pl>
#testfest AmsterdamPHP 2012-06-23
--FILE--
<?php
$depth0 = md5('recursiveDirectoryIterator::getSubPath');
$depth1 = md5('depth1');
$depth2 = md5('depth2');
$targetDir = __DIR__ . DIRECTORY_SEPARATOR . $depth0 . DIRECTORY_SEPARATOR . $depth1 . DIRECTORY_SEPARATOR . $depth2;
mkdir($targetDir, 0777, true);
touch($targetDir . DIRECTORY_SEPARATOR . 'getSubPath_test.tmp');
$iterator = new RecursiveDirectoryIterator(__DIR__ . DIRECTORY_SEPARATOR . $depth0);
$it = new RecursiveIteratorIterator($iterator);
$list = [];
while($it->valid()) {
$list[] = $it->getSubPath();
$it->next();
}
asort($list);
foreach ($list as $item) {
echo $item . "\n";
}
?>
==DONE==
--CLEAN--
<?php
function rrmdir($dir) {
foreach(glob($dir . '/*') as $file) {
if(is_dir($file)) {
rrmdir($file);
} else {
unlink($file);
}
}
rmdir($dir);
}
$targetDir = __DIR__.DIRECTORY_SEPARATOR.md5('recursiveDirectoryIterator::getSubPath');
rrmdir($targetDir);
?>
--EXPECT--
a0c967a6c2c34786e4802f59af9356f5
a0c967a6c2c34786e4802f59af9356f5
a0c967a6c2c34786e4802f59af9356f5/9925aabb545352472e4d77942627b507
a0c967a6c2c34786e4802f59af9356f5/9925aabb545352472e4d77942627b507
a0c967a6c2c34786e4802f59af9356f5/9925aabb545352472e4d77942627b507
==DONE==

58
ext/spl/tests/RecursiveDirectoryIterator_getSubPathname_basic.phpt Normal file
View File

@ -0,0 +1,58 @@
--TEST--
RecursiveDirectoryIterator::getBasePathname() - basic test
--CREDITS--
Pawel Krynicki <pawel [dot] krynicki [at] xsolve [dot] pl>
#testfest AmsterdamPHP 2012-06-23
--FILE--
<?php
$depth0 = md5('recursiveDirectoryIterator::getSubPathname');
$depth1 = md5('depth1');
$depth2 = md5('depth2');
$targetDir = __DIR__ . DIRECTORY_SEPARATOR . $depth0 . DIRECTORY_SEPARATOR . $depth1 . DIRECTORY_SEPARATOR . $depth2;
mkdir($targetDir, 0777, true);
touch($targetDir . DIRECTORY_SEPARATOR . 'getSubPathname_test_2.tmp');
touch(__DIR__ . DIRECTORY_SEPARATOR . $depth0 . DIRECTORY_SEPARATOR . $depth1 . DIRECTORY_SEPARATOR . 'getSubPathname_test_3.tmp');
touch(__DIR__ . DIRECTORY_SEPARATOR . $depth0 . DIRECTORY_SEPARATOR . 'getSubPathname_test_1.tmp');
$iterator = new RecursiveDirectoryIterator(__DIR__ . DIRECTORY_SEPARATOR . $depth0);
$it = new RecursiveIteratorIterator($iterator);
$list = [];
while($it->valid()) {
$list[] = $it->getSubPathname();
$it->next();
}
asort($list);
foreach ($list as $item) {
echo $item . "\n";
}
?>
==DONE==
--CLEAN--
<?php
function rrmdir($dir) {
foreach(glob($dir . '/*') as $file) {
if(is_dir($file)) {
rrmdir($file);
} else {
unlink($file);
}
}
rmdir($dir);
}
$targetDir = __DIR__ . DIRECTORY_SEPARATOR . md5('recursiveDirectoryIterator::getSubPathname');
rrmdir($targetDir);
?>
--EXPECT--
.
.
..
a0c967a6c2c34786e4802f59af9356f5/.
a0c967a6c2c34786e4802f59af9356f5/..
a0c967a6c2c34786e4802f59af9356f5/9925aabb545352472e4d77942627b507/.
a0c967a6c2c34786e4802f59af9356f5/9925aabb545352472e4d77942627b507/..
a0c967a6c2c34786e4802f59af9356f5/9925aabb545352472e4d77942627b507/getSubPathname_test_2.tmp
a0c967a6c2c34786e4802f59af9356f5/getSubPathname_test_3.tmp
getSubPathname_test_1.tmp
==DONE==

13
ext/standard/tests/strings/http_build_query_error.phpt Normal file
View File

@ -0,0 +1,13 @@
--TEST--
Testing error on null parameter 1 of http_build_query()
--CREDITS--
Pawel Krynicki <pawel.krynicki [at] xsolve [dot] pl>
#testfest AmsterdamPHP 2012-06-23
--FILE--
<?php
$result = http_build_query(null);
?>
--EXPECTF--
Warning: http_build_query(): Parameter 1 expected to be Array or Object. %s value given in %s on line %d