[HttpFoundation] UploadedFile::getOriginalName is now overriding getName

symfony · Mar 9, 2011 · Feb 9, 2011 · Feb 9, 2011 · Feb 9, 2011 · Feb 9, 2011
commit 991b1ed22504de51fe2ebca6eb898c4fa4da2e0c
diff --git a/src/Symfony/Component/Form/FileField.php b/src/Symfony/Component/Form/FileField.php
@@ -90,7 +90,7 @@ protected function preprocessData(array $data)
                 default:
                     $data['file']->move($this->getTmpDir());
                     $data['file']->rename($this->getTmpName($data['token']));
-                    $data['original_name'] = $data['file']->getOriginalName();
+                    $data['original_name'] = $data['file']->getName();
                     $data['file'] = '';
                     break;
             }

diff --git a/src/Symfony/Component/HttpFoundation/File/UploadedFile.php b/src/Symfony/Component/HttpFoundation/File/UploadedFile.php
@@ -2,7 +2,7 @@
 
 /*
  * This file is part of the Symfony package.
- * 
+ *
  * (c) Fabien Potencier <fabien@symfony.com>
  *
  * For the full copyright and license information, please view the LICENSE
@@ -101,13 +101,18 @@ public function getMimeType()
     }
 
     /**
-     * Returns the original file name including its extension.
+     * Returns the absolute file name without dots
+     *
+     * Until the uploaded file is moved, it will return the name of the temporary file
      *
-     * @returns string  The file name
+     * @returns string  The file path
      */
-    public function getOriginalName()
+    public function getName()
     {
-        return $this->originalName;
+        if (!$this->moved) {
+            return $this->originalName;
+        }
+        return parent::getName();
     }
 
     /**

diff --git a/tests/Symfony/Tests/Component/Form/FileFieldTest.php b/tests/Symfony/Tests/Component/Form/FileFieldTest.php
@@ -70,7 +70,7 @@ public function testSubmitUploadsNewFiles()
                 $that->createTmpFile($tmpPath);
              }));
         $file->expects($this->any())
-             ->method('getOriginalName')
+             ->method('getName')
              ->will($this->returnValue('original_name.jpg'));
 
         $this->field->submit(array(

diff --git a/tests/Symfony/Tests/Component/HttpFoundation/File/UploadedFileTest.php b/tests/Symfony/Tests/Component/HttpFoundation/File/UploadedFileTest.php
@@ -95,7 +95,7 @@ public function testGetOriginalName()
                 null
             );
 
-            $this->assertEquals('original.gif', $file->getOriginalName());
+            $this->assertEquals('original.gif', $file->getName());
         }
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -95,7 +95,7 @@ public function testGetOriginalName() @@
                     null
                 );
-                $this->assertEquals('original.gif', $file->getOriginalName());
+                $this->assertEquals('original.gif', $file->getName());
             }
         }
     }