FileUpload::getSanitizedName: Remove redundant minus before dot. (#179)

nette · May 14, 2020 · c9fc147 · c9fc147
1 parent e944078
commit c9fc147
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/Http/FileUpload.php b/src/Http/FileUpload.php
@@ -75,7 +75,7 @@ public function getName(): string
 	 */
 	public function getSanitizedName(): string
 	{
-		return trim(Nette\Utils\Strings::webalize($this->name, '.', false), '.-');
+		return trim(str_replace('-.', '.', Nette\Utils\Strings::webalize($this->name, '.', false)), '.-');
 	}
 
 

diff --git a/tests/Http/FileUpload.basic.phpt b/tests/Http/FileUpload.basic.phpt
@@ -51,6 +51,19 @@ test(function () {
 });
 
 
+test(function () {
+	$upload = new FileUpload([
+		'name' => 'logo 2020+.pdf',
+		'type' => 'text/plain',
+		'tmp_name' => __DIR__ . '/files/logo.png',
+		'error' => 0,
+		'size' => 209,
+	]);
+
+	Assert::same('logo-2020.pdf', $upload->getSanitizedName());
+});
+
+
 test(function () {
 	$upload = new FileUpload([
 		'name' => '',
-Original file line number
+Diff line change
@@ Expand Up / @@ -75,7 +75,7 @@ public function getName(): string @@
     	 */
     	public function getSanitizedName(): string
     	{
-    		return trim(Nette\Utils\Strings::webalize($this->name, '.', false), '.-');
+    		return trim(str_replace('-.', '.', Nette\Utils\Strings::webalize($this->name, '.', false)), '.-');
     	}
@@ Expand Down @@