Refactor FileBind and File

Author: rkit

src/behaviors/FileBind.php

@@ -34,7 +34,7 @@ public function bindSingle($storage, $ownerId, $ownerType, $fileId)
             if ($file->tmp) {
                 $file = $this->saveTmpDirToStorage($file, $ownerId);
                 if ($file) {
-                    $this->deleteCurrentFiles($storage, $ownerId, $ownerType, $file);
+                    $this->deleteCurrentFiles($storage, $ownerId, $ownerType, [$file->id => $file]);
                     $file->updateAttributes($file->getDirtyAttributes());
                     $file->setStorage($storage);
                 }
@@ -75,7 +75,7 @@ public function bindMultiple($storage, $ownerId, $ownerType, $files)
                 unset($newFiles[$fileId]);
                 continue;
             }
-            $this->deleteCurrentFiles($storage, $ownerId, $ownerType, null, $newFiles);
+            $this->deleteCurrentFiles($storage, $ownerId, $ownerType, $newFiles);
         } else {
             $this->deleteCurrentFiles($storage, $ownerId, $ownerType);
         }
@@ -107,17 +107,15 @@ private function saveTmpDirToStorage(File $file, $ownerId)
      * @param Storage $storage
      * @param int $ownerId The id of the owner
      * @param int $ownerType The type of the owner
-     * @param rkit\filemanager\models\File $exceptFile
      * @param rkit\filemanager\models\File[] $exceptFiles
      * @return void
      */
-    private function deleteCurrentFiles($storage, $ownerId, $ownerType, $exceptFile = null, $exceptFiles = [])
+    private function deleteCurrentFiles($storage, $ownerId, $ownerType, $exceptFiles = [])
     {
         $currentFiles = File::findAllByOwner($ownerId, $ownerType);
         foreach ($currentFiles as $currFile) {
-            $isExceptFile = $exceptFile !== null && $currFile->id === $exceptFile->id;
             $isExceptFiles = count($exceptFiles) && array_key_exists($currFile->id, $exceptFiles);
-            if (!$isExceptFile && !$isExceptFiles) {
+            if (!$isExceptFiles) {
                 $currFile->setStorage($storage);
                 $currFile->delete();
             }

src/models/File.php

@@ -116,11 +116,8 @@ public function beforeSave($insert)
                 if (!file_exists($this->path)) {
                     return false;
                 }
-                if (!Yii::$app instanceof \yii\console\Application) {
-                    $this->user_id = Yii::$app->user->isGuest ? 0 : Yii::$app->user->id; // @codeCoverageIgnore
-                    $this->ip = ip2long(Yii::$app->request->getUserIP()); // @codeCoverageIgnore
-                } // @codeCoverageIgnore
 
+                $this->fillUserInfo();
                 $this->fillMetaInfo();
 
                 if ($this->owner_id === null) {
@@ -134,6 +131,14 @@ public function beforeSave($insert)
         return false; // @codeCoverageIgnore
     }
 
+    private function fillUserInfo()
+    {
+        if (!Yii::$app instanceof \yii\console\Application) {
+            $this->user_id = Yii::$app->user->isGuest ? 0 : Yii::$app->user->id; // @codeCoverageIgnore
+            $this->ip = ip2long(Yii::$app->request->getUserIP()); // @codeCoverageIgnore
+        } // @codeCoverageIgnore
+    }
+
     private function fillMetaInfo()
     {
         $pathInfo = pathinfo($this->path);