Core and composer updates

web/core/modules/file/migration_templates/d6_file.yml

@@ -7,7 +7,7 @@ migration_tags:
 source:
   plugin: d6_file
   constants:
-    # source_base_path must be set by the tool configuring this migration. It
+    # The tool configuring this migration must set source_base_path. It
     # represents the fully qualified path relative to which URIs in the files
     # table are specified, and must end with a /. See source_full_path
     # configuration in this migration's process pipeline as an example.

web/core/modules/file/migration_templates/d6_upload.yml

@@ -13,7 +13,7 @@ process:
     source: upload
     process:
       target_id:
-        plugin: migration
+        plugin: migration_lookup
         migration: d6_file
         source: fid
       display: list

web/core/modules/file/migration_templates/d6_upload_entity_display.yml

@@ -14,7 +14,14 @@ source:
       settings: {}
 process:
   entity_type: 'constants/entity_type'
-  bundle: node_type
+  bundle:
+    -
+      plugin: migration_lookup
+      migration: d6_node_type
+      source: node_type
+    -
+      plugin: skip_on_empty
+      method: row
   view_mode: 'constants/view_mode'
   field_name: 'constants/name'
   type: 'constants/type'

web/core/modules/file/migration_templates/d6_upload_entity_form_display.yml

@@ -15,7 +15,14 @@ source:
         progress_indicator: throbber
 process:
   entity_type: 'constants/entity_type'
-  bundle: node_type
+  bundle:
+    -
+      plugin: migration_lookup
+      migration: d6_node_type
+      source: node_type
+    -
+      plugin: skip_on_empty
+      method: row
   field_name: 'constants/name'
   form_mode: 'constants/form_mode'
   type: 'constants/type'

web/core/modules/file/migration_templates/d6_upload_field_instance.yml

@@ -13,7 +13,7 @@ process:
   entity_type: 'constants/entity_type'
   bundle:
     -
-      plugin: migration
+      plugin: migration_lookup
       migration: d6_node_type
       source: node_type
     -

web/core/modules/file/migration_templates/d7_file.yml

@@ -7,8 +7,8 @@ migration_tags:
 source:
   plugin: d7_file
   constants:
-    # source_base_path must be set by the tool configuring this migration. It
-    # represents the fully qualified path relative to which uris in the files
+    # The tool configuring this migration must set source_base_path. It
+    # represents the fully qualified path relative to which URIs in the files
     # table are specified, and must end with a /. See source_full_path
     # configuration in this migration's process pipeline as an example.
     source_base_path: ''
@@ -32,8 +32,7 @@ process:
       - '@source_full_path'
       - uri
   filemime: filemime
-  # filesize is dynamically computed when file entities are saved, so there is
-  # no point in migrating it.
+  # No need to migrate filesize, it is computed when file entities are saved.
   # filesize: filesize
   status: status
   # Drupal 7 didn't keep track of the file's creation or update time -- all it