Merge pull request #1708 from ossinkine/issue-1708

Remove code duplications in UploadableListener

Author: l3pp4rd

lib/Gedmo/Uploadable/UploadableListener.php

@@ -167,13 +167,7 @@ public function onFlush(EventArgs $args)
 
             if ($config = $this->getConfiguration($om, $meta->name)) {
                 if (isset($config['uploadable']) && $config['uploadable']) {
-                    if ($config['filePathField']) {
-                        $this->pendingFileRemovals[] = $this->getFilePathFieldValue($meta, $config, $object);
-                    } else {
-                        $path     = $this->getPath($meta, $config, $object);
-                        $fileName = $this->getFileNameFieldValue($meta, $config, $object);
-                        $this->pendingFileRemovals[] = $path.DIRECTORY_SEPARATOR.$fileName;
-                    }
+                    $this->addFileRemoval($meta, $config, $object);
                 }
             }
         }
@@ -281,13 +275,7 @@ public function processFile(AdapterInterface $ea, $object, $action)
 
         if ($action === self::ACTION_UPDATE) {
             // First we add the original file to the pendingFileRemovals array
-            if ($config['filePathField']) {
-                $this->pendingFileRemovals[] = $this->getFilePathFieldValue($meta, $config, $object);
-            } else {
-                $path     = $this->getPath($meta, $config, $object);
-                $fileName = $this->getFileNameFieldValue($meta, $config, $object);
-                $this->pendingFileRemovals[] = $path.DIRECTORY_SEPARATOR.$fileName;
-            }
+            $this->addFileRemoval($meta, $config, $object);
         }
 
         // We generate the filename based on configuration
@@ -390,6 +378,34 @@ protected function getPath(ClassMetadata $meta, array $config, $object)
         return $path;
     }
 
+    /**
+     * @param ClassMetadata $meta
+     * @param array         $config
+     * @param object        $object Entity
+     */
+    protected function addFileRemoval($meta, $config, $object)
+    {
+        if ($config['filePathField']) {
+            $this->pendingFileRemovals[] = $this->getFilePathFieldValue($meta, $config, $object);
+        } else {
+            $path     = $this->getPath($meta, $config, $object);
+            $fileName = $this->getFileNameFieldValue($meta, $config, $object);
+            $this->pendingFileRemovals[] = $path.DIRECTORY_SEPARATOR.$fileName;
+        }
+    }
+
+    /**
+     * @param string $filePath
+     */
+    protected function cancelFileRemoval($filePath)
+    {
+        $k = array_search($filePath, $this->pendingFileRemovals, true);
+
+        if (false !== $k) {
+            unset($this->pendingFileRemovals[$k]);
+        }
+    }
+
     /**
      * Returns value of the entity's property
      *
@@ -563,14 +579,7 @@ public function moveFile(FileInfoInterface $fileInfo, $path, $filenameGeneratorC
 
         if (is_file($info['filePath'])) {
             if ($overwrite) {
-                
-                $k = array_search($info['filePath'], $this->pendingFileRemovals);
-                
-                if ($k !== false)
-                {
-                    unset($this->pendingFileRemovals[$k]);
-                }
-                
+                $this->cancelFileRemoval($info['filePath']);
                 $this->removeFile($info['filePath']);
             } elseif ($appendNumber) {
                 $counter = 1;