Upgrade to 3.6.1

kirby/src/Filesystem/Dir.php

@@ -5,6 +5,7 @@ namespace Kirby\Filesystem;
 use Exception;
 use Kirby\Cms\App;
 use Kirby\Cms\Page;
+use Kirby\Toolkit\Str;
 use Throwable;
 
 /**
@@ -450,7 +451,7 @@ class Dir
             $modified = ($newModified > $modified) ? $newModified : $modified;
         }
 
-        return $format !== null ? $handler($format, $modified) : $modified;
+        return Str::date($modified, $format, $handler);
     }
 
     /**
@@ -504,8 +505,8 @@ class Dir
         }
 
         // create the ignore pattern
-        $ignore = $ignore ?? static::$ignore;
-        $ignore = array_merge($ignore, ['.', '..']);
+        $ignore ??= static::$ignore;
+        $ignore   = array_merge($ignore, ['.', '..']);
 
         // scan for all files and dirs
         $result = array_values((array)array_diff(scandir($dir), $ignore));