Merge pull request #62 from bscheshirwork/disk-operations-use-helper

[WIP] Refactor createFolder and removeFile operations
zxbodya · Nov 16, 2018 · 4164f01 · bscheshirwork · Nov 16, 2018 · 4164f01
2 parents db899b2 + be472e3
commit 4164f01
Showing 1 changed file with 3 additions and 11 deletions.
diff --git a/GalleryBehavior.php b/GalleryBehavior.php
@@ -8,6 +8,7 @@
 use yii\base\Exception;
 use yii\db\ActiveRecord;
 use yii\db\Query;
+use yii\helpers\FileHelper;
 use yii\imagine\Image;
 
 /**
@@ -253,9 +254,7 @@ public function replaceImage($imageId, $path)
 
     private function removeFile($fileName)
     {
-        if (file_exists($fileName)) {
-            @unlink($fileName);
-        }
+        return FileHelper::unlink($fileName);
     }
 
     /**
@@ -277,14 +276,7 @@ public function getGalleryId()
 
     private function createFolders($filePath)
     {
-        $parts = explode('/', $filePath);
-        // skip file name
-        $parts = array_slice($parts, 0, count($parts) - 1);
-        $targetPath = implode('/', $parts);
-        $path = realpath($targetPath);
-        if (!$path) {
-            mkdir($targetPath, 0777, true);
-        }
+        return FileHelper::createDirectory(FileHelper::normalizePath($filePath), 0777);
     }
 
     /////////////////////////////// ========== Public Actions ============ ///////////////////////////