Revert Str::short(appendix: false)

#5495 (review)
getkirby · Sep 24, 2023 · 13360cd · 13360cd
1 parent ad7de06
commit 13360cd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/src/Toolkit/Str.php b/src/Toolkit/Str.php
@@ -980,7 +980,7 @@ public static function safeTemplate(
 	public static function short(
 		string $string = null,
 		int $length = 0,
-		string|false $appendix = '…'
+		string $appendix = '…'
 	): string {
 		if ($string === null) {
 			return '';
@@ -994,12 +994,7 @@ public static function short(
 			return $string;
 		}
 
-		$string = static::substr($string, 0, $length);
-
-		return match ($appendix) {
-			false   => $string,
-			default => $string . $appendix
-		};
+		return static::substr($string, 0, $length) . $appendix;
 	}
 
 	/**
@@ -1124,7 +1119,7 @@ public static function slug(
 		$string = preg_replace('![^a-z0-9]+$!', '', $string);
 
 		// cut the string after the given maxlength
-		return static::short($string, $maxlength, false);
+		return static::short($string, $maxlength, '');
 	}
 
 	/**

diff --git a/tests/Toolkit/StrTest.php b/tests/Toolkit/StrTest.php
@@ -984,6 +984,9 @@ public function testShort()
 		// with different ellipsis character
 		$this->assertSame('Super---', Str::short($string, 5, '---'));
 
+		// without ellipsis
+		$this->assertSame('Super', Str::short($string, 5, ''));
+
 		// with null
 		$this->assertSame('', Str::short(null, 5));