[Uploadable] Fix appendNumber renaming for files without extension (#2460)

* Fix `appendNumber` renaming for files without extension

Fixes #2228

* [Coding Standards fix] Fix `appendNumber` renaming for files without extension

Fixes #2228

* Update CHANGELOG.md

#2460

Co-authored-by: Fran Moreno <[email protected]>

* Update tests/Gedmo/Uploadable/UploadableEntityTest.php

#2460

Co-authored-by: Fran Moreno <[email protected]>

Co-authored-by: Fran Moreno <[email protected]>

Author: downace

CHANGELOG.md

@@ -27,6 +27,9 @@ a release.
 - Dropped support for doctrine/mongodb-odm < 2.3.
 - Make doctrine/cache an optional dependency.
 
+## Fixed
+- Loggable: Fix `appendNumber` renaming for files without extension (#2228)
+
 ## [3.6.0] - 2022-03-19
 ### Added
 - Translatable: Add defaultTranslationValue option to allow null or string value (#2167). TranslatableListener can hydrate object properties with null value, but it may cause a Type error for non-nullable getter upon a missing translation.

src/Uploadable/UploadableListener.php

@@ -445,7 +445,7 @@ public function moveFile(FileInfoInterface $fileInfo, $path, $filenameGeneratorC
             $info['fileExtension'] = substr($info['filePath'], strrpos($info['filePath'], '.'));
             $info['fileWithoutExt'] = substr($info['filePath'], 0, strrpos($info['filePath'], '.'));
         } else {
-            $info['fileWithoutExt'] = $info['fileName'];
+            $info['fileWithoutExt'] = $info['filePath'];
         }
 
         // Save the original filename for later use

tests/Gedmo/Uploadable/UploadableEntityTest.php

@@ -477,15 +477,32 @@ public function testRemoveFileIfItsNotAFileThenReturnFalse(): void
         static::assertFalse($this->listener->removeFile('non_existent_file'));
     }
 
-    public function testMoveFileUsingAppendNumberOptionAppendsNumberToFilenameIfItAlreadyExists(): void
+    public function dataProvider_testMoveFileUsingAppendNumberOptionAppendsNumberToFilenameIfItAlreadyExists(): array
+    {
+        return [
+            'With extension' => [
+                'Filename' => 'test.txt',
+                'Expected filename' => 'test-2.txt',
+            ],
+            'Without extension' => [
+                'Filename' => 'test',
+                'Expected filename' => 'test-2',
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider dataProvider_testMoveFileUsingAppendNumberOptionAppendsNumberToFilenameIfItAlreadyExists
+     */
+    public function testMoveFileUsingAppendNumberOptionAppendsNumberToFilenameIfItAlreadyExists(string $filename, string $expectedFilename): void
     {
         $file = new FileAppendNumber();
         $file2 = new FileAppendNumber();
 
         $file->setTitle('test');
         $file2->setTitle('test2');
 
-        $fileInfo = $this->generateUploadedFile();
+        $fileInfo = $this->generateUploadedFile(false, $filename);
 
         $this->listener->addEntityFileInfo($file, $fileInfo);
 
@@ -499,9 +516,7 @@ public function testMoveFileUsingAppendNumberOptionAppendsNumberToFilenameIfItAl
 
         $this->em->refresh($file2);
 
-        $filename = substr($file2->getFilePath(), strrpos($file2->getFilePath(), '/') + 1);
-
-        static::assertSame('test-2.txt', $filename);
+        static::assertSame($expectedFilename, basename($file2->getFilePath()));
     }
 
     public function testMoveFileUsingAppendNumberOptionAppendsNumberToFilenameIfItAlreadyExistsRelativePath(): void