prefixed filesystem methods #1568

luyadev · Nov 5, 2017 · 55bd31f · 55bd31f
1 parent 09a6b94
commit 55bd31f
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/modules/admin/src/filesystem/LocalFileSystem.php b/modules/admin/src/filesystem/LocalFileSystem.php
@@ -101,7 +101,7 @@ public function getServerPath()
  /**
  * @inheritdoc
  */
- public function saveFile($source, $fileName)
+ public function fileSystemSaveFile($source, $fileName)
  {
  $savePath = $this->getServerPath() . '/' . $fileName;
 
@@ -121,7 +121,7 @@ public function saveFile($source, $fileName)
  /**
  * @inheritdoc
  */
- public function replaceFile($oldSource, $newSource)
+ public function fileSystemReplaceFile($oldSource, $newSource)
  {
  $toDelete = $oldSource . uniqid('oldfile') . '.bkl';
  if (rename($oldSource, $toDelete)) {
@@ -136,7 +136,7 @@ public function replaceFile($oldSource, $newSource)
  /**
  * @inheritdoc
  */
- public function deleteFile($source)
+ public function fileSystemDeleteFile($source)
  {
  return FileHelper::unlink($source);
  }

diff --git a/modules/admin/src/helpers/Storage.php b/modules/admin/src/helpers/Storage.php
@@ -178,7 +178,7 @@ public static function replaceFile($oldFileSource, $newFileSource, $newFileName)
  return false;
  }
 
- return Yii::$app->storage->replaceFile($oldFileSource, $newFileSource);
+ return Yii::$app->storage->fileSystemReplaceFile($oldFileSource, $newFileSource);
  }
 
  /**

diff --git a/modules/admin/src/models/StorageFile.php b/modules/admin/src/models/StorageFile.php
@@ -69,7 +69,7 @@ public function delete()
  $file = Yii::$app->storage->getFile($this->id);
 
  if ($file) {
- if (!Yii::$app->storage->deleteFile($file->serverSource)) {
+ if (!Yii::$app->storage->fileSystemDeleteFile($file->serverSource)) {
  Logger::error("Unable to remove storage file: " . $file->serverSource);
  }
  }

diff --git a/modules/admin/src/models/StorageImage.php b/modules/admin/src/models/StorageImage.php
@@ -56,7 +56,7 @@ public function deleteSource()
  {
  $image = Yii::$app->storage->getImage($this->id);
  if ($image) {
- if (!Yii::$app->storage->deleteFile($image->serverSource)) {
+ if (!Yii::$app->storage->fileSystemDeleteFile($image->serverSource)) {
  return false; // unable to unlink image
  }
  } else {

diff --git a/modules/admin/src/storage/BaseFileSystemStorage.php b/modules/admin/src/storage/BaseFileSystemStorage.php
@@ -134,7 +134,7 @@ abstract public function getServerPath();
  * @param string $fileName The new of the file on the file system like `MyNewFile.jpg`.
  * @return boolean Whether the file has been stored or not.
  */
- abstract public function saveFile($source, $fileName);
+ abstract public function fileSystemSaveFile($source, $fileName);
 
  /**
  * Replace an existing file source with a new one on the filesystem.
@@ -143,14 +143,14 @@ abstract public function saveFile($source, $fileName);
  * @param string $newSource The absolute file source path and filename, like `/tmp/upload/myfile.jpg`.
  * @return boolean Whether the file has replaced stored or not.
  */
- abstract public function replaceFile($oldSource, $newSource);
+ abstract public function fileSystemReplaceFile($oldSource, $newSource);
 
  /**
  * Delete a given file source on the filesystem.
  * @param string $source The absolute file source path and filename, like `/tmp/upload/myfile.jpg`.
  * @return boolean Whether the file has been deleted or not.
  */
- abstract public function deleteFile($source);
+ abstract public function fileSystemDeleteFile($source);
 
  /**
  * @var array The mime types which will be rejected.
@@ -428,7 +428,7 @@ public function addFile($fileSource, $fileName, $folderId = 0, $isHidden = false
 
  $newName = implode([$fileData['secureFileName'].'_'.$fileData['hashName'], $fileData['extension']], '.');
 
- if (!$this->saveFile($fileSource, $newName)) {
+ if (!$this->fileSystemSaveFile($fileSource, $newName)) {
  return false;
  }