Move isWindows check to Utils

Author: flaviocopes

system/src/Grav/Common/Filesystem/Folder.php

@@ -9,6 +9,7 @@
 namespace Grav\Common\Filesystem;
 
 use Grav\Common\Grav;
+use Grav\Common\Utils;
 use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
 
 abstract class Folder
@@ -341,7 +342,7 @@ public static function move($source, $target)
         self::create(dirname($target));
 
         // Just rename the directory.
-        if (self::execIsDisabled() || self::isWindows()) {
+        if (self::execIsDisabled() || Utils::isWindows()) {
             // exec disabled, or windows. Cannot use mv. Fallback to rename() although
             // not working cross volumes
             $success = @rename($source, $target);
@@ -362,15 +363,6 @@ public static function move($source, $target)
         @touch(dirname($target));
     }
 
-    /**
-     * Utility method to determine if the current OS is Windows
-     *
-     * @return bool
-     */
-    private static function isWindows() {
-        return strncasecmp(PHP_OS, 'WIN', 3) == 0;
-    }
-
     /**
      * Utility method to check if `exec` is disabled in the PHP disabled functioons
      *

system/src/Grav/Common/Utils.php

@@ -813,4 +813,13 @@ public static function setDotNotation(&$array, $key, $value, $merge = false)
 
         return $array;
     }
+
+    /**
+     * Utility method to determine if the current OS is Windows
+     *
+     * @return bool
+     */
+    public static function isWindows() {
+        return strncasecmp(PHP_OS, 'WIN', 3) == 0;
+    }
 }