From ab657bc7a9759bf21113c61d39840e29e6028f6b Mon Sep 17 00:00:00 2001
From: ockstadt <36147797+ockstadt@users.noreply.github.com>
Date: Wed, 14 Dec 2022 09:05:47 +0100
Subject: [PATCH] remove FilenameUtils (#1338)

---
 UPGRADE.md                       |  4 ++++
 src/Util/FilenameUtils.php       | 30 ------------------------------
 src/Util/Transliterator.php      | 21 +++++++++++++++++++--
 tests/Util/FilenameUtilsTest.php | 28 ----------------------------
 4 files changed, 23 insertions(+), 60 deletions(-)
 delete mode 100644 src/Util/FilenameUtils.php
 delete mode 100644 tests/Util/FilenameUtilsTest.php

diff --git a/UPGRADE.md b/UPGRADE.md
index ea3615da..c44e9d34 100644
--- a/UPGRADE.md
+++ b/UPGRADE.md
@@ -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
diff --git a/src/Util/FilenameUtils.php b/src/Util/FilenameUtils.php
deleted file mode 100644
index 5e998a98..00000000
--- a/src/Util/FilenameUtils.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-namespace Vich\UploaderBundle\Util;
-
-/**
- * @internal
- */
-final class FilenameUtils
-{
-    /**
-     * This class should not be instantiated.
-     */
-    private function __construct()
-    {
-    }
-
-    /**
-     * Splits filename for array of basename and extension.
-     *
-     * @return array An array of basename and extension
-     */
-    public static function spitNameByExtension(string $filename): array
-    {
-        if (false === $pos = \strrpos($filename, '.')) {
-            return [$filename, ''];
-        }
-
-        return [\substr($filename, 0, $pos), \substr($filename, $pos + 1)];
-    }
-}
diff --git a/src/Util/Transliterator.php b/src/Util/Transliterator.php
index a850fbae..eee4ccfa 100644
--- a/src/Util/Transliterator.php
+++ b/src/Util/Transliterator.php
@@ -3,6 +3,9 @@
 namespace Vich\UploaderBundle\Util;
 
 use Symfony\Component\String\Slugger\SluggerInterface;
+use function strrpos;
+use function strtolower;
+use function substr;
 
 /**
  * @internal
@@ -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)];
     }
 }
diff --git a/tests/Util/FilenameUtilsTest.php b/tests/Util/FilenameUtilsTest.php
deleted file mode 100644
index d2290248..00000000
--- a/tests/Util/FilenameUtilsTest.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-namespace Vich\UploaderBundle\Tests\Util;
-
-use PHPUnit\Framework\TestCase;
-use Vich\UploaderBundle\Util\FilenameUtils;
-
-final class FilenameUtilsTest extends TestCase
-{
-    /**
-     * @dataProvider spitNameByExtensionProvider
-     */
-    public function testSpitNameByExtension(string $filename, string $basename, string $extension): void
-    {
-        self::assertSame([$basename, $extension], FilenameUtils::spitNameByExtension($filename));
-    }
-
-    public function spitNameByExtensionProvider(): array
-    {
-        return [
-            'simple filename with extension' => ['filename.extension', 'filename', 'extension'],
-            'cyrillic filename with extension  ' => ['Текстовый файл.txt', 'Текстовый файл', 'txt'],
-            'cyrillic filename with dot and extension' => ['Текстовый .файл.txt', 'Текстовый .файл', 'txt'],
-            'cyrillic filename without extension ends with dot' => ['Текстовый файл.', 'Текстовый файл', ''],
-            'cyrillic filename without extension' => ['Текстовый файл', 'Текстовый файл', ''],
-        ];
-    }
-}