Merge branch 'develop-patch' into develop-minor

config/sections/stats.php

@@ -8,7 +8,7 @@
 	],
 	'props' => [
 		/**
-		 * Array or query string for reports. Each report needs a `label` and `value` and can have additional `info`, `link` and `theme` settings.
+		 * Array or query string for reports. Each report needs a `label` and `value` and can have additional `info`, `link`, `icon` and `theme` settings.
 		 */
 		'reports' => function ($reports = null) {
 			if ($reports === null) {

src/Cms/FileModifications.php

@@ -105,6 +105,14 @@ public function resize(
 		]);
 	}
 
+	/**
+	 * Sharpens the image
+	 */
+	public function sharpen(int $amount = 50): FileVersion|File|Asset
+	{
+		return $this->thumb(['sharpen' => $amount]);
+	}
+
 	/**
 	 * Create a srcset definition for the given sizes
 	 * Sizes can be defined as a simple array. They can

src/Filesystem/File.php

@@ -277,6 +277,15 @@ public function match(array $rules): bool
 		if (is_array($rules['mime'] ?? null) === true) {
 			$mime = $this->mime();
 
+			// the MIME type could not be determined, but matching
+			// to it was requested explicitly
+			if ($mime === null) {
+				throw new Exception([
+					'key'  => 'file.mime.missing',
+					'data' => ['filename' => $this->filename()]
+				]);
+			}
+
 			// determine if any pattern matches the MIME type;
 			// once any pattern matches, `$carry` is `true` and the rest is skipped
 			$matches = array_reduce(

src/Toolkit/Str.php

@@ -488,7 +488,16 @@ public static function excerpt(
 			return $string;
 		}
 
-		return static::substr($string, 0, mb_strrpos(static::substr($string, 0, $chars), ' ')) . $rep;
+		// shorten the string to the specified number of characters,
+		// but make sure to not cut off in the middle of a word
+		$excerpt = static::substr($string, 0, $chars);
+		$cutoff  = mb_strrpos($excerpt, ' ');
+
+		if ($cutoff !== false) {
+			$excerpt = static::substr($string, 0, $cutoff);
+		}
+
+		return $excerpt . $rep;
 	}
 
 	/**

tests/Cms/Files/FileModificationsTest.php

@@ -323,4 +323,34 @@ public function testResize()
 		$file = $app->file('test.jpg');
 		$file->resize(100, 200, 10);
 	}
+
+	public function testSharpen()
+	{
+		$app = $this->app->clone([
+			'components' => [
+				'file::version' => function ($kirby, $file, $options = []) {
+					$this->assertSame(['sharpen' => 50], $options);
+					return $file;
+				}
+			]
+		]);
+
+		$file = $app->file('test.jpg');
+		$file->sharpen();
+	}
+
+	public function testSharpenWithCustomValue()
+	{
+		$app = $this->app->clone([
+			'components' => [
+				'file::version' => function ($kirby, $file, $options = []) {
+					$this->assertSame(['sharpen' => 20], $options);
+					return $file;
+				}
+			]
+		]);
+
+		$file = $app->file('test.jpg');
+		$file->sharpen(20);
+	}
 }

tests/Filesystem/FileTest.php

@@ -378,9 +378,20 @@ public function testMatch()
 	}
 
 	/**
-	 * @covers \Kirby\Filesystem\File::match
+	 * @covers ::match
 	 */
-	public function testMatchMimeException()
+	public function testMatchMimeMissing()
+	{
+		$this->expectException(Exception::class);
+		$this->expectExceptionMessage('The media type for "doesnotexist.invalid" cannot be detected');
+
+		$this->_file('doesnotexist.invalid')->match(['mime' => ['image/png', 'application/pdf']]);
+	}
+
+	/**
+	 * @covers ::match
+	 */
+	public function testMatchMimeInvalid()
 	{
 		$this->expectException(Exception::class);
 		$this->expectExceptionMessage('Invalid mime type: text/plain');
@@ -392,7 +403,7 @@ public function testMatchMimeException()
 	}
 
 	/**
-	 * @covers \Kirby\Filesystem\File::match
+	 * @covers ::match
 	 */
 	public function testMatchExtensionException()
 	{
@@ -406,7 +417,7 @@ public function testMatchExtensionException()
 	}
 
 	/**
-	 * @covers \Kirby\Filesystem\File::match
+	 * @covers ::match
 	 */
 	public function testMatchTypeException()
 	{

tests/Toolkit/StrTest.php

@@ -397,6 +397,18 @@ public function testExcerptWithSpaces()
 		$this->assertSame($expected, $result);
 	}
 
+	/**
+	 * @covers ::excerpt
+	 */
+	public function testExcerptWithoutSpaces()
+	{
+		$string   = 'ThisIsALongTextWithSomeHtml';
+		$expected = 'ThisIsALongText …';
+		$result   = Str::excerpt($string, 15);
+
+		$this->assertSame($expected, $result);
+	}
+
 	/**
 	 * @covers ::excerpt
 	 */