Revert "Corrected uploaded file path overwriting file path"

This reverts commit 45f9104.
akeneo-labs · Sep 11, 2014 · c78d559 · c78d559
1 parent 68fa53d
commit c78d559
Showing 1 changed file with 2 additions and 29 deletions.
diff --git a/Reader/FileIteratorReader.php b/Reader/FileIteratorReader.php
@@ -40,11 +40,6 @@ class FileIteratorReader extends AbstractIteratorReader implements UploadedFileA
      */
     protected $filePath;
 
-    /**
-     * @var string
-     */
-    protected $uploadedFilePath;
-
     /**
      * @var boolean
      *
@@ -115,7 +110,7 @@ public function getUploadedFileConstraints()
      */
     public function setUploadedFile(File $uploadedFile)
     {
-        $this->uploadedFilePath = $uploadedFile->getRealPath();
+        $this->filePath = $uploadedFile->getRealPath();
         $this->reset();
 
         return $this;
@@ -175,21 +170,7 @@ public function getFilePath()
      */
     protected function createIterator()
     {
-        return $this->iteratorFactory->create(
-            $this->iteratorClass,
-            $this->getImportedFilePath(),
-            $this->getIteratorOptions()
-        );
-    }
-
-    /**
-     * Returns the path of the uploaded file
-     * 
-     * @return string
-     */
-    protected function getImportedFilePath()
-    {
-        return $this->uploadedFilePath ?: $this->filePath;
+        return $this->iteratorFactory->create($this->iteratorClass, $this->filePath, $this->getIteratorOptions());
     }
 
     /**
@@ -201,12 +182,4 @@ protected function getIteratorOptions()
     {
         return $this->iteratorOptions;
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function initialize()
-    {
-        parent::initialize();
-    }
 }