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

kirby/src/Filesystem/F.php

@@ -475,11 +475,7 @@ class F
 
         $modified = filemtime($file);
 
-        if (is_null($format) === true) {
-            return $modified;
-        }
-
-        return $handler($format, $modified);
+        return Str::date($modified, $format, $handler);
     }
 
     /**

kirby/src/Filesystem/Filename.php

@@ -109,9 +109,10 @@ class Filename
             'q'          => $this->quality(),
         ];
 
-        $array = array_filter($array, function ($item) {
-            return $item !== null && $item !== false && $item !== '';
-        });
+        $array = array_filter(
+            $array,
+            fn ($item) => $item !== null && $item !== false && $item !== ''
+        );
 
         return $array;
     }

kirby/src/Filesystem/Mime.php

@@ -320,7 +320,7 @@ class Mime
         }
 
         // get the extension or extract it from the filename
-        $extension = $extension ?? F::extension($file);
+        $extension ??= F::extension($file);
 
         // try to guess the mime type at least
         if ($mime === false) {