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

core/modules/file/migrations/d7_file.yml

+1 −8
Original line number Diff line number Diff line
@@ -19,14 +19,7 @@ process: 
  # If you are using this file to build a custom migration consider removing

  # the fid field to allow incremental migrations.

  fid: fid

  # File entity module uses file_managed.filename as the entity title, while

  # 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

  filename: filename

  source_full_path:

    -

      plugin: concat

core/modules/file/migrations/d7_file_private.yml

+1 −8
Original line number Diff line number Diff line
@@ -17,14 +17,7 @@ process: 
  # If you are using this file to build a custom migration consider removing

  # the fid field to allow incremental migrations.

  fid: fid

  # File entity module uses file_managed.filename as the entity title, while

  # 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

  filename: filename

  source_full_path:

    -

      plugin: concat

core/modules/file/tests/modules/file_test_get_ids/migrations/d7_file_used.yml

+1 −8
Original line number Diff line number Diff line
@@ -9,14 +9,7 @@ source: 
    source_base_path: ''

process:

  fid: fid

  # File entity module uses file_managed.filename as the entity title, while

  # 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

  filename: filename

  source_full_path:

    -

      plugin: concat

core/modules/file/tests/src/Kernel/Migrate/d7/MigrateFileTest.php

+0 −4
Original line number Diff line number Diff line
@@ -24,10 +24,6 @@ class MigrateFileTest extends MigrateDrupal7TestBase { 
   */

  protected function setUp(): void {

    parent::setUp();

    $this->sourceDatabase->update('file_managed')

      ->fields(['filename' => 'this can have spaces in it'])

      ->condition('fid', 1)

      ->execute();

    $this->fileMigrationSetup();

  }

core/modules/file/tests/src/Kernel/Migrate/d7/MigratePrivateFileTest.php

+0 −4
Original line number Diff line number Diff line
@@ -24,10 +24,6 @@ class MigratePrivateFileTest extends MigrateDrupal7TestBase { 
   */

  protected function setUp(): void {

    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->fileMigrationSetup();

  }