Merge pull request #58 from niels-nijens/fix-file-upload

Fix UploadTrait::getFileUpload

Author: niels-nijens

Model/UploadTrait.php

@@ -27,7 +27,7 @@ trait UploadTrait
      */
     public function getFileUpload()
     {
-        $propertyName = $this->getFileUploadPropertyName();
+        $propertyName = $this->getFileUploadPropertyName(__FUNCTION__);
 
         if (isset($this->fileUploads[$propertyName])) {
             return $this->fileUploads[$propertyName];

Tests/Model/UploadTraitTest.php

@@ -61,4 +61,40 @@ public function testSetFileUploadFromProxy()
             $uploadEntityProxyMock
         );
     }
+
+    /**
+     * Tests if the UploadEntityMock::getImageUpload (alias of UploadTrait::getFileUpload)
+     * returns the expected file uploads property.
+     */
+    public function testGetFileUpload()
+    {
+        $uploadedFileMock = $this->getMockBuilder(UploadedFile::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $entityMock = new UploadEntityMock();
+        $entityMock->setImageUpload($uploadedFileMock);
+
+        $this->assertSame($uploadedFileMock, $entityMock->getImageUpload($uploadedFileMock));
+    }
+
+    /**
+     * Tests if the UploadEntityProxyMock::getImageUpload (alias of UploadTrait::getFileUpload)
+     * sets the expected file uploads property.
+     *
+     * This tests the scenario of a Doctrine entity being a parent class of
+     * a proxy class with all the method overloaded as this changes the
+     * PHP stack to determine the caller method.
+     */
+    public function testGetFileUploadFromProxy()
+    {
+        $uploadedFileMock = $this->getMockBuilder(UploadedFile::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $uploadEntityProxyMock = new UploadEntityProxyMock();
+        $uploadEntityProxyMock->setImageUpload($uploadedFileMock);
+
+        $this->assertSame($uploadedFileMock, $uploadEntityProxyMock->getImageUpload($uploadedFileMock));
+    }
 }

Tests/UploadEntityProxyMock.php

@@ -11,6 +11,16 @@
  */
 class UploadEntityProxyMock extends UploadEntityMock
 {
+    /**
+     * Overloaded trait method alias.
+     *
+     * @return UploadedFile
+     */
+    public function getImageUpload()
+    {
+        return parent::getImageUpload();
+    }
+
     /**
      * Overloaded trait method alias.
      *