From 8d036fbefc48bc9985385b4e4c5f6a2e3cd1fe58 Mon Sep 17 00:00:00 2001 From: Awilum Date: Sun, 18 Oct 2020 22:21:47 +0300 Subject: [PATCH] feat(media-folder): rename rename() method to move() method. BREAKING CHANGES - USE mpve() method INSTEAD OF rename() method. --- src/flextype/Foundation/Media/MediaFolders.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/flextype/Foundation/Media/MediaFolders.php b/src/flextype/Foundation/Media/MediaFolders.php index 4a8a92ac..87626659 100644 --- a/src/flextype/Foundation/Media/MediaFolders.php +++ b/src/flextype/Foundation/Media/MediaFolders.php @@ -106,7 +106,7 @@ class MediaFolders } /** - * Rename folder + * Move folder * * @param string $id Unique identifier of the folder. * @param string $new_id New Unique identifier of the folder. @@ -115,10 +115,12 @@ class MediaFolders * * @access public */ - public function rename(string $id, string $new_id): bool + public function move(string $id, string $new_id): bool { - if (! Filesystem::has($this->getDirLocation($new_id)) && ! Filesystem::has(flextype('media_folders_meta')->getDirMetaLocation($new_id))) { - return rename($this->getDirLocation($id), $this->getDirLocation($new_id)) && rename(flextype('media_folders_meta')->getDirMetaLocation($id), flextype('media_folders_meta')->getDirMetaLocation($new_id)); + if ((flextype('filesystem')->directory($this->getDirLocation($new_id))->exists() === false && + flextype('filesystem')->directory(flextype('media_folders_meta')->getDirMetaLocation($new_id))->exists() === false)) { + return flextype('filesystem')->directory($this->getDirLocation($id))->move($this->getDirLocation($new_id)) && + flextype('filesystem')->directory(flextype('media_folders_meta')->getDirMetaLocation($id))->move(flextype('media_folders_meta')->getDirMetaLocation($new_id)); } return false;