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

Author: weltling

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);
 }
 
 ?>

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);
 }
 
 ?>

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);
 }
 
 ?>