Commit 94133129 authored by catch's avatar catch
Browse files

Revert "Issue #3022910 by quietone, juampynr, chandrashekhar_srijan,...

Revert "Issue #3022910 by quietone, juampynr, chandrashekhar_srijan, alisonjo315, heddn, benjifisher: Prevent migrated files from having an incorrect value at file_managed.filename"

This reverts commit 9c38b992.
parent 4d0a7ba5
...@@ -19,14 +19,7 @@ process: ...@@ -19,14 +19,7 @@ process:
# If you are using this file to build a custom migration consider removing # If you are using this file to build a custom migration consider removing
# the fid field to allow incremental migrations. # the fid field to allow incremental migrations.
fid: fid fid: fid
# File entity module uses file_managed.filename as the entity title, while filename: filename
# Drupal 8 expects this to be an actual file name. Therefore, extract the
# filename from the uri field. Otherwise, the file will migrate but form
# validation won't pass when editing it.
filename:
plugin: callback
callable: basename
source: uri
source_full_path: source_full_path:
- -
plugin: concat plugin: concat
......
...@@ -17,14 +17,7 @@ process: ...@@ -17,14 +17,7 @@ process:
# If you are using this file to build a custom migration consider removing # If you are using this file to build a custom migration consider removing
# the fid field to allow incremental migrations. # the fid field to allow incremental migrations.
fid: fid fid: fid
# File entity module uses file_managed.filename as the entity title, while filename: filename
# Drupal 8 expects this to be an actual file name. Therefore, extract the
# filename from the uri field. Otherwise, the file will migrate but form
# validation won't pass when editing it.
filename:
plugin: callback
callable: basename
source: uri
source_full_path: source_full_path:
- -
plugin: concat plugin: concat
......
...@@ -9,14 +9,7 @@ source: ...@@ -9,14 +9,7 @@ source:
source_base_path: '' source_base_path: ''
process: process:
fid: fid fid: fid
# File entity module uses file_managed.filename as the entity title, while filename: filename
# Drupal 8 expects this to be an actual file name. Therefore, extract the
# filename from the uri field. Otherwise, the file will migrate but form
# validation won't pass when editing it.
filename:
plugin: callback
callable: basename
source: uri
source_full_path: source_full_path:
- -
plugin: concat plugin: concat
......
...@@ -24,10 +24,6 @@ class MigrateFileTest extends MigrateDrupal7TestBase { ...@@ -24,10 +24,6 @@ class MigrateFileTest extends MigrateDrupal7TestBase {
*/ */
protected function setUp(): void { protected function setUp(): void {
parent::setUp(); parent::setUp();
$this->sourceDatabase->update('file_managed')
->fields(['filename' => 'this can have spaces in it'])
->condition('fid', 1)
->execute();
$this->fileMigrationSetup(); $this->fileMigrationSetup();
} }
......
...@@ -24,10 +24,6 @@ class MigratePrivateFileTest extends MigrateDrupal7TestBase { ...@@ -24,10 +24,6 @@ class MigratePrivateFileTest extends MigrateDrupal7TestBase {
*/ */
protected function setUp(): void { protected function setUp(): void {
parent::setUp(); parent::setUp();
$this->sourceDatabase->update('file_managed')
->fields(['filename' => 'this can have spaces in it'])
->condition('fid', 3)
->execute();
$this->setSetting('file_private_path', $this->container->getParameter('site.path') . '/private'); $this->setSetting('file_private_path', $this->container->getParameter('site.path') . '/private');
$this->fileMigrationSetup(); $this->fileMigrationSetup();
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment