Merge branch 'hotfix/v2.1.7'

roadiz · Apr 4, 2023 · d265a9c · d265a9c
2 parents 398ae3c + 8d98e98
commit d265a9c
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [v2.1.7](https://github.com/roadiz/core-bundle-dev-app/compare/v2.1.6...v2.1.7) (2023-04-04)
+
+
+### Bug Fixes
+
+* **Documents:** Prevent renaming document filename if new pathname is not available ([13982cc](https://github.com/roadiz/core-bundle-dev-app/commit/13982cce13b1876d6f55167a40abcb456cd1e64f))
+
 ## [v2.1.6](https://github.com/roadiz/core-bundle-dev-app/compare/v2.1.5...v2.1.6) (2023-03-23)
 
 

diff --git a/lib/Documents/src/AbstractDocumentFinder.php b/lib/Documents/src/AbstractDocumentFinder.php
@@ -51,17 +51,25 @@ public function findAudiosWithFilename(string $fileName): iterable
      */
     public function findPicturesWithFilename(string $fileName): iterable
     {
-        $basename = pathinfo($fileName);
-        $basename = $basename['filename'];
-
-        $sourcesDocsName = [
-            $basename . '.jpg',
-            $basename . '.gif',
-            $basename . '.png',
-            $basename . '.jpeg',
-            $basename . '.webp',
+        $pathInfo = pathinfo($fileName);
+        $basename = $pathInfo['filename'];
+        $currentExtension = $pathInfo['extension'];
+        $extensionsList = [
+            'jpg',
+            'gif',
+            'png',
+            'jpeg',
+            'webp',
+            'avif',
         ];
 
+        // remove current extension from list
+        $extensionsList = array_diff($extensionsList, [$currentExtension]);
+        // list sources paths for extensions
+        $sourcesDocsName = array_values(array_map(function ($extension) use ($basename) {
+            return $basename . '.' . $extension;
+        }, $extensionsList));
+
         return $this->findAllByFilenames($sourcesDocsName);
     }
 }
diff --git a/lib/Documents/src/Events/DocumentLifeCycleSubscriber.php b/lib/Documents/src/Events/DocumentLifeCycleSubscriber.php
@@ -10,6 +10,7 @@
 use Doctrine\Persistence\Event\LifecycleEventArgs;
 use League\Flysystem\FilesystemException;
 use League\Flysystem\FilesystemOperator;
+use League\Flysystem\UnableToMoveFile;
 use League\Flysystem\Visibility;
 use RZ\Roadiz\Documents\Exceptions\DocumentWithoutFileException;
 use RZ\Roadiz\Documents\Models\DocumentInterface;
@@ -60,6 +61,8 @@ public function preUpdate(PreUpdateEventArgs $args): void
                      * Only perform IO rename if old file exists and new path is free.
                      */
                     $this->documentsStorage->move($oldPath, $newPath);
+                } else {
+                    throw new UnableToMoveFile('Cannot rename file from ' . $oldPath . ' to ' . $newPath);
                 }
             }
         }

diff --git a/lib/RoadizCoreBundle/config/services.yaml b/lib/RoadizCoreBundle/config/services.yaml
@@ -22,7 +22,7 @@ services:
         autowire: true      # Automatically injects dependencies in your services.
         autoconfigure: true # Automatically registers your services as commands, event subscribers, etc.
         bind:
-            $cmsVersion: '2.1.6'
+            $cmsVersion: '2.1.7'
             $appVersion: '%roadiz_core.app_version%'
             $cmsVersionPrefix: 'main'
             $staticDomain: '%roadiz_core.static_domain_name%'

diff --git a/lib/Rozier/src/Controllers/Documents/DocumentsController.php b/lib/Rozier/src/Controllers/Documents/DocumentsController.php
@@ -7,6 +7,7 @@
 use GuzzleHttp\Exception\RequestException;
 use League\Flysystem\FilesystemException;
 use League\Flysystem\FilesystemOperator;
+use League\Flysystem\UnableToMoveFile;
 use Psr\Log\LoggerInterface;
 use RZ\Roadiz\Core\Handlers\HandlerFactoryInterface;
 use RZ\Roadiz\CoreBundle\Document\DocumentFactory;
@@ -366,6 +367,8 @@ public function editAction(Request $request, int $documentId): Response
                     'documentsEditPage',
                     $routeParams
                 );
+            } catch (FilesystemException $exception) {
+                $form->get('filename')->addError(new FormError($exception->getMessage()));
             } catch (FileException $exception) {
                 $form->get('filename')->addError(new FormError($exception->getMessage()));
             }