diff options
| author | Anatol Belski <ab@php.net> | 2015-01-05 19:20:07 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-01-05 19:20:07 +0100 |
| commit | 4756207e7ef9fcaa80039f5cf2f6b8f8935bf66b (patch) | |
| tree | 0ebeaaff2c60516dbfaea83dc8589ad95f57e7e1 | |
| parent | 480044a0eadee346c52ca03801d9f1f8b816e918 (diff) | |
| parent | 339139f876aff8adacec89814c1278608976668f (diff) | |
| download | php-git-4756207e7ef9fcaa80039f5cf2f6b8f8935bf66b.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix ACLs tests, make it create dir where it has to, not file
| -rw-r--r-- | ext/standard/tests/file/windows_acls/bug44859.phpt | 4 | ||||
| -rw-r--r-- | ext/standard/tests/file/windows_acls/bug44859_2.phpt | 4 | ||||
| -rw-r--r-- | ext/standard/tests/file/windows_acls/bug44859_4.phpt | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/ext/standard/tests/file/windows_acls/bug44859.phpt b/ext/standard/tests/file/windows_acls/bug44859.phpt index 952b6eb4c4..4454ee1173 100644 --- a/ext/standard/tests/file/windows_acls/bug44859.phpt +++ b/ext/standard/tests/file/windows_acls/bug44859.phpt @@ -37,7 +37,7 @@ echo "Testing directory:\n"; $path = __DIR__ . '/adir'; $i = 1; foreach ($iteration as $perms => $exp) { - create_file($path, $perms); + create_dir($path, $perms); clearstatcache(true, $path); echo 'Iteration #' . $i++ . ': '; if (is_writable($path) == $exp) { @@ -46,7 +46,7 @@ foreach ($iteration as $perms => $exp) { var_dump(is_writable($path), $exp); echo "failed.\n"; } - delete_file($path); + delete_dir($path); } ?> diff --git a/ext/standard/tests/file/windows_acls/bug44859_2.phpt b/ext/standard/tests/file/windows_acls/bug44859_2.phpt index d741156baa..514953f42e 100644 --- a/ext/standard/tests/file/windows_acls/bug44859_2.phpt +++ b/ext/standard/tests/file/windows_acls/bug44859_2.phpt @@ -37,7 +37,7 @@ echo "Testing directory:\n"; $path = __DIR__ . '/adir'; $i = 1; foreach ($iteration as $perms => $exp) { - create_file($path, $perms); + create_dir($path, $perms); clearstatcache(true, $path); echo 'Iteration #' . $i++ . ': '; if (is_readable($path) == $exp) { @@ -46,7 +46,7 @@ foreach ($iteration as $perms => $exp) { var_dump(is_readable($path), $exp); echo "failed.\n"; } - delete_file($path); + delete_dir($path); } ?> diff --git a/ext/standard/tests/file/windows_acls/bug44859_4.phpt b/ext/standard/tests/file/windows_acls/bug44859_4.phpt index 954c1004a5..bf640fa660 100644 --- a/ext/standard/tests/file/windows_acls/bug44859_4.phpt +++ b/ext/standard/tests/file/windows_acls/bug44859_4.phpt @@ -39,7 +39,7 @@ echo "Testing directory with relative path:\n"; $path = 'adir'; $i = 1; foreach ($iteration as $perms => $exp) { - create_file($path, $perms); + create_dir($path, $perms); clearstatcache(true, $path); echo 'Iteration #' . $i++ . ': '; if (is_readable($path) == $exp) { @@ -48,7 +48,7 @@ foreach ($iteration as $perms => $exp) { var_dump(is_readable($path), $exp); echo "failed.\n"; } - delete_file($path); + delete_dir($path); } ?> |