From c8d2e5778c486a9839a9cb663fdb57793bef15cb Mon Sep 17 00:00:00 2001
From: sasanikolic90 <sasa.nikolic@student.upr.si>
Date: Tue, 15 Sep 2015 11:34:33 +0200
Subject: [PATCH 1/2] Get the right name, load the entity from file id and get
 uri

---
 src/Form/FileEditForm.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/Form/FileEditForm.php b/src/Form/FileEditForm.php
index 030e4fb..a2966c3 100644
--- a/src/Form/FileEditForm.php
+++ b/src/Form/FileEditForm.php
@@ -8,7 +8,9 @@
 namespace Drupal\file_entity\Form;
 
 use Drupal\Core\Entity\ContentEntityForm;
+use Drupal\Core\Entity\Entity;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\file\Entity\File;
 use Drupal\file\FileInterface;
 use Drupal\file_entity\Entity\FileType;
 
@@ -118,10 +120,11 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
     // Check if a replacement file has been uploaded.
     if ($form_state->getValue('replace_upload')) {
       $replacement = $form_state->getValue('replace_upload')[0];
-      $log_args = array('@old' => $this->entity->getFilename(), '@new' => $replacement->getFilename());
+      $entity_replacement = File::load($replacement);
+      $log_args = array('@old' => $this->entity->getFilename(), '@new' => $form_state->getValue('filename')[0]['value']);
       // Move file from temp to permanent home.
-      if (file_unmanaged_copy($replacement->getFileUri(), $this->entity->getFileUri(), FILE_EXISTS_REPLACE)) {
-        $replacement->delete();
+      if (file_unmanaged_copy($entity_replacement->getFileUri(), $this->entity->getFileUri(), FILE_EXISTS_REPLACE)) {
+        $entity_replacement->delete();
         \Drupal::logger('file_entity')->info('File @old was replaced by @new', $log_args);
       }
       else {

From dabd578919cd34b930143effbc0c3830843a7d4c Mon Sep 17 00:00:00 2001
From: sasanikolic90 <sasa.nikolic@student.upr.si>
Date: Thu, 24 Sep 2015 12:06:08 +0200
Subject: [PATCH 2/2] Temporary fix for the failing test.

---
 src/Form/FileEditForm.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Form/FileEditForm.php b/src/Form/FileEditForm.php
index a2966c3..d5cea6b 100644
--- a/src/Form/FileEditForm.php
+++ b/src/Form/FileEditForm.php
@@ -120,8 +120,12 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
     // Check if a replacement file has been uploaded.
     if ($form_state->getValue('replace_upload')) {
       $replacement = $form_state->getValue('replace_upload')[0];
-      $entity_replacement = File::load($replacement);
-      $log_args = array('@old' => $this->entity->getFilename(), '@new' => $form_state->getValue('filename')[0]['value']);
+      if ($replacement instanceof FileEntity) {
+        $entity_replacement = $replacement;
+      } else {
+        $entity_replacement = File::load($replacement);
+      }
+      $log_args = array('@old' => $this->entity->getFilename(), '@new' => $entity_replacement->getFileName());
       // Move file from temp to permanent home.
       if (file_unmanaged_copy($entity_replacement->getFileUri(), $this->entity->getFileUri(), FILE_EXISTS_REPLACE)) {
         $entity_replacement->delete();