Skip to content

Commit

Permalink
remove FilenameUtils (dustin10#1338)
Browse files Browse the repository at this point in the history
  • Loading branch information
ockstadt authored Dec 14, 2022
1 parent b4734d9 commit ab657bc
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 60 deletions.
4 changes: 4 additions & 0 deletions UPGRADE.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Upgrading from v2.0.1 to v2.1.0

* the internal class `FilenameUtils` has been removed.

# Upgrading from v1 to v2.0.0

* every class marked as `@final` is now final
Expand Down
30 changes: 0 additions & 30 deletions src/Util/FilenameUtils.php

This file was deleted.

21 changes: 19 additions & 2 deletions src/Util/Transliterator.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
namespace Vich\UploaderBundle\Util;

use Symfony\Component\String\Slugger\SluggerInterface;
use function strrpos;
use function strtolower;
use function substr;

/**
* @internal
Expand All @@ -18,12 +21,26 @@ public function __construct(private readonly SluggerInterface $slugger)
*/
public function transliterate(string $string, string $separator = '-'): string
{
[$filename, $extension] = FilenameUtils::spitNameByExtension($string);
[$filename, $extension] = $this->splitNameByExtension($string);
$transliterated = $this->slugger->slug($filename, $separator);
if ('' !== $extension) {
$transliterated .= '.'.$extension;
}

return \strtolower($transliterated);
return strtolower($transliterated);
}

/**
* Splits filename for array of basename and extension.
*
* @return array An array of basename and extension
*/
private function splitNameByExtension(string $filename): array
{
if (false === $pos = strrpos($filename, '.')) {
return [$filename, ''];
}

return [substr($filename, 0, $pos), substr($filename, $pos + 1)];
}
}
28 changes: 0 additions & 28 deletions tests/Util/FilenameUtilsTest.php

This file was deleted.

0 comments on commit ab657bc

Please sign in to comment.