Skip to content

Commit 4f6ef41

Browse files
authored
Clean filename (#6)
* Update dependencies * CS * remove space remplacement
1 parent 8967d17 commit 4f6ef41

File tree

5 files changed

+7
-9
lines changed

5 files changed

+7
-9
lines changed

component/File.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ public static function cleanFilename(string $fileName): string
5252
$fileName = str_replace('\'', ' ', $fileName);
5353
$fileName = preg_replace('/\s+/', ' ', $fileName);
5454
$fileName = trim($fileName);
55-
$fileName = preg_replace(['/\s/', '/\.[\.]+/', '/[^\w_\.\-]/'], ['_', '.', ''], $fileName);
55+
$fileName = preg_replace('/\.+/', '.', $fileName);
56+
$fileName = preg_replace('/[^\w\s_\.\-]/', '', $fileName);
5657

5758
$extension = strtolower($extension);
5859
$extension = trim($extension);

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
},
1515
"require-dev": {
1616
"friendsofphp/php-cs-fixer": "3.*",
17-
"phpstan/phpstan": "1.*",
18-
"phpunit/phpunit": "9.*"
17+
"phpstan/phpstan": "2.*",
18+
"phpunit/phpunit": "11.*"
1919
},
2020
"scripts": {
2121
"lint": "vendor/bin/php-cs-fixer fix ./ --rules=@PSR12",

test/CsvTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
namespace Test\Service;
66

77
use PHPUnit\Framework\TestCase;
8-
98
use Phant\File\Csv;
109

1110
final class CsvTest extends TestCase

test/FileTest.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
namespace Test\Service;
66

77
use PHPUnit\Framework\TestCase;
8-
98
use Phant\File\File;
109

1110
final class FileTest extends TestCase
@@ -68,12 +67,12 @@ public function testCleanFilename(): void
6867
$result = File::cleanFilename(' µ \' û ');
6968

7069
$this->assertIsString($result);
71-
$this->assertEquals('u_u', $result);
70+
$this->assertEquals('u u', $result);
7271

73-
$result = File::cleanFilename(' µ û . Jpg');
72+
$result = File::cleanFilename(' µ û .. Jpg');
7473

7574
$this->assertIsString($result);
76-
$this->assertEquals('u_u.jpg', $result);
75+
$this->assertEquals('u u.jpg', $result);
7776
}
7877

7978
public function testDownload(): void

test/ZipTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
namespace Test\Service;
66

77
use PHPUnit\Framework\TestCase;
8-
98
use Phant\File\Zip;
109

1110
final class ZipTest extends TestCase

0 commit comments

Comments
 (0)