Merge pull request #4091 from resurtm/4080-file-helper-remove-directory-symlinks

framework/helpers/BaseFileHelper.php

@@ -277,10 +277,11 @@ class BaseFileHelper
      */
     public static function removeDirectory($dir, $options = [])
     {
-        if (!isset($options['traverseSymlinks'])) {
-            $options['traverseSymlinks'] = false;
+        if (!is_dir($dir)) {
+            return;
         }
-        if (!is_dir($dir) || !($handle = opendir($dir))) {
+        if (!is_link($dir) || isset($options['traverseSymlinks']) && $options['traverseSymlinks']) {
+            if (!($handle = opendir($dir))) {
                 return;
             }
             while (($file = readdir($handle)) !== false) {
@@ -288,21 +289,17 @@ class BaseFileHelper
                     continue;
                 }
                 $path = $dir . DIRECTORY_SEPARATOR . $file;
-            if (is_link($path)) {
-                if ($options['traverseSymlinks'] && is_dir($path)) {
+                if (is_dir($path)) {
                     static::removeDirectory($path, $options);
-                }
-                unlink($path);
                 } else {
-                if (is_file($path)) {
                     unlink($path);
-                } else {
-                    static::removeDirectory($path, $options);
-                }
                 }
             }
             closedir($handle);
-        if (!is_link($dir)) {
+        }
+        if (is_link($dir)) {
+            unlink($dir);
+        } else {
             rmdir($dir);
         }
     }