Merge branch 'PHP-5.4'

* PHP-5.4:
  fixed #62433 test for win
This commit is contained in:
Anatoliy Belsky 2012-07-09 12:45:56 +02:00
commit f76bb14814

View file

@ -5,11 +5,11 @@ Bug #62433 Inconsistent behavior of RecursiveDirectoryIterator to dot files (. a
$dots = array_keys(iterator_to_array(new RecursiveDirectoryIterator(__DIR__))); $dots = array_keys(iterator_to_array(new RecursiveDirectoryIterator(__DIR__)));
$ndots = array_keys(iterator_to_array(new RecursiveDirectoryIterator(__DIR__, FilesystemIterator::SKIP_DOTS))); $ndots = array_keys(iterator_to_array(new RecursiveDirectoryIterator(__DIR__, FilesystemIterator::SKIP_DOTS)));
var_dump(in_array(__DIR__ . '/.', $dots)); var_dump(in_array(__DIR__ . DIRECTORY_SEPARATOR . '.', $dots));
var_dump(in_array(__DIR__ . '/..', $dots)); var_dump(in_array(__DIR__ . DIRECTORY_SEPARATOR . '..', $dots));
var_dump(in_array(__DIR__ . '/.', $ndots)); var_dump(in_array(__DIR__ . DIRECTORY_SEPARATOR . '.', $ndots));
var_dump(in_array(__DIR__ . '/..', $ndots)); var_dump(in_array(__DIR__ . DIRECTORY_SEPARATOR . '..', $ndots));
?> ?>
--EXPECT-- --EXPECT--
bool(true) bool(true)