Core and composer updates

web/core/modules/aggregator/config/optional/views.view.aggregator_rss_feed.yml

@@ -3,6 +3,7 @@ status: true
 dependencies:
   module:
     - aggregator
+    - user
 id: aggregator_rss_feed
 label: 'Aggregator RSS feed'
 module: aggregator
@@ -137,6 +138,8 @@ display:
         - url.query_args
         - user.permissions
       cacheable: false
+      max-age: -1
+      tags: {  }
   feed_items:
     display_plugin: feed
     id: feed_items
@@ -154,3 +157,5 @@ display:
         - 'languages:language_interface'
         - user.permissions
       cacheable: false
+      max-age: -1
+      tags: {  }

web/core/modules/aggregator/config/optional/views.view.aggregator_sources.yml

@@ -143,7 +143,8 @@ display:
         - 'languages:language_interface'
         - url.query_args
         - user.permissions
-      max-age: 0
+      max-age: -1
+      tags: {  }
   feed_1:
     display_plugin: feed
     id: feed_1
@@ -401,7 +402,8 @@ display:
         - 'languages:language_content'
         - 'languages:language_interface'
         - user.permissions
-      max-age: 0
+      max-age: -1
+      tags: {  }
   page_1:
     display_plugin: page
     id: page_1
@@ -423,4 +425,5 @@ display:
         - 'languages:language_interface'
         - url.query_args
         - user.permissions
-      max-age: 0
+      max-age: -1
+      tags: {  }

web/core/modules/aggregator/migration_templates/d6_aggregator_item.yml

@@ -7,7 +7,7 @@ source:
 process:
   iid: iid
   fid:
-    plugin: migration
+    plugin: migration_lookup
     migration: d6_aggregator_feed
     source: fid
   title: title

web/core/modules/aggregator/migration_templates/d7_aggregator_item.yml

@@ -7,7 +7,7 @@ source:
 process:
   iid: iid
   fid:
-    plugin: migration
+    plugin: migration_lookup
     migration: d7_aggregator_feed
     source: fid
   title: title

web/core/modules/aggregator/src/Tests/FeedAdminDisplayTest.php

@@ -60,4 +60,14 @@ class FeedAdminDisplayTest extends AggregatorTestBase {
     $this->assertNoText('left', 'The feed is not scheduled. It does not show a timeframe "x x left" for next update.');
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function randomMachineName($length = 8) {
+    $value = parent::randomMachineName($length);
+    // See expected values in testFeedUpdateFields().
+    $value = str_replace(['never', 'imminently', 'ago', 'left'], 'x', $value);
+    return $value;
+  }
+
 }