Upgrade to 4.1.0

kirby/src/Filesystem/Dir.php

@@ -169,7 +169,10 @@ class Dir
 			$result[] = $entry;
 
 			if ($recursive === true && is_dir($root) === true) {
-				$result = array_merge($result, static::index($root, true, $ignore, $entry));
+				$result = [
+					...$result,
+					...static::index($root, true, $ignore, $entry)
+				];
 			}
 		}
 
@@ -402,10 +405,8 @@ class Dir
 
 		$parent = dirname($dir);
 
-		if ($recursive === true) {
-			if (is_dir($parent) === false) {
-				static::make($parent, true);
-			}
+		if ($recursive === true && is_dir($parent) === false) {
+			static::make($parent, true);
 		}
 
 		if (is_writable($parent) === false) {
@@ -429,18 +430,19 @@ class Dir
 	 * @param 'date'|'intl'|'strftime'|null $handler Custom date handler or `null`
 	 *                                               for the globally configured one
 	 */
-	public static function modified(string $dir, string $format = null, string|null $handler = null): int|string
-	{
+	public static function modified(
+		string $dir,
+		string $format = null,
+		string|null $handler = null
+	): int|string {
 		$modified = filemtime($dir);
 		$items    = static::read($dir);
 
 		foreach ($items as $item) {
-			if (is_file($dir . '/' . $item) === true) {
-				$newModified = filemtime($dir . '/' . $item);
-			} else {
-				$newModified = static::modified($dir . '/' . $item);
-			}
-
+			$newModified = match (is_file($dir . '/' . $item)) {
+				true  => filemtime($dir . '/' . $item),
+				false => static::modified($dir . '/' . $item)
+			};
 			$modified = ($newModified > $modified) ? $newModified : $modified;
 		}
 
@@ -595,7 +597,10 @@ class Dir
 				return true;
 			}
 
-			if (is_dir($subdir) === true && static::wasModifiedAfter($subdir, $time) === true) {
+			if (
+				is_dir($subdir) === true &&
+				static::wasModifiedAfter($subdir, $time) === true
+			) {
 				return true;
 			}
 		}

kirby/src/Filesystem/F.php

@@ -800,11 +800,11 @@ class F
 			);
 		}
 
-		try {
-			return filesize($file);
-		} catch (Throwable) {
-			return 0;
+		if ($size = @filesize($file)) {
+			return $size;
 		}
+
+		return 0;
 	}
 
 	/**

kirby/src/Filesystem/Filename.php

@@ -89,6 +89,7 @@ class Filename
 			'blur'       => $this->blur(),
 			'bw'         => $this->grayscale(),
 			'q'          => $this->quality(),
+			'sharpen'    => $this->sharpen(),
 		];
 
 		$array = array_filter(
@@ -244,6 +245,18 @@ class Filename
 		return F::safeBasename($name);
 	}
 
+	/**
+	 * Normalizes the sharpen option value
+	 */
+	public function sharpen(): int|false
+	{
+		return match ($this->attributes['sharpen'] ?? false) {
+			false   => false,
+			true    => 50,
+			default => (int)$this->attributes['sharpen']
+		};
+	}
+
 	/**
 	 * Returns the converted filename as string
 	 */