updated core from 8.4 to 8.5 : bug with login_destination

core/modules/aggregator/aggregator.info.yml

@@ -9,8 +9,8 @@ dependencies:
   - file
   - options
 
-# Information added by Drupal.org packaging script on 2018-01-03
-version: '8.4.4'
+# Information added by Drupal.org packaging script on 2018-03-07
+version: '8.5.0'
 core: '8.x'
 project: 'drupal'
-datestamp: 1515021228
+datestamp: 1520457826

core/modules/aggregator/migrations/d6_aggregator_feed.yml

@@ -1,7 +1,9 @@
 id: d6_aggregator_feed
 label: Aggregator feeds
+audit: true
 migration_tags:
   - Drupal 6
+  - Content
 source:
   plugin: aggregator_feed
 process:

core/modules/aggregator/migrations/d6_aggregator_item.yml

@@ -1,7 +1,9 @@
 id: d6_aggregator_item
 label: Aggregator items
+audit: true
 migration_tags:
   - Drupal 6
+  - Content
 source:
   plugin: aggregator_item
 process:

core/modules/aggregator/migrations/d6_aggregator_settings.yml

@@ -2,6 +2,7 @@ id: d6_aggregator_settings
 label: Aggregator configuration
 migration_tags:
   - Drupal 6
+  - Configuration
 source:
   plugin: variable
   variables:

core/modules/aggregator/migrations/d7_aggregator_feed.yml

@@ -1,7 +1,9 @@
 id: d7_aggregator_feed
 label: Aggregator feeds
+audit: true
 migration_tags:
   - Drupal 7
+  - Content
 source:
   plugin: aggregator_feed
 process:

core/modules/aggregator/migrations/d7_aggregator_item.yml

@@ -1,7 +1,9 @@
 id: d7_aggregator_item
 label: Aggregator items
+audit: true
 migration_tags:
   - Drupal 7
+  - Content
 source:
   plugin: aggregator_item
 process:

core/modules/aggregator/migrations/d7_aggregator_settings.yml

@@ -2,6 +2,7 @@ id: d7_aggregator_settings
 label: Aggregator configuration
 migration_tags:
   - Drupal 7
+  - Configuration
 source:
   plugin: variable
   variables:

core/modules/aggregator/src/Controller/AggregatorController.php

@@ -93,7 +93,7 @@ class AggregatorController extends ControllerBase {
     $message = $aggregator_feed->refreshItems()
       ? $this->t('There is new syndicated content from %site.', ['%site' => $aggregator_feed->label()])
       : $this->t('There is no new syndicated content from %site.', ['%site' => $aggregator_feed->label()]);
-    drupal_set_message($message);
+    $this->messenger()->addStatus($message);
     return $this->redirect('aggregator.admin_overview');
   }
 

core/modules/aggregator/src/FeedForm.php

@@ -8,6 +8,8 @@ use Drupal\Core\Url;
 
 /**
  * Form handler for the aggregator feed edit forms.
+ *
+ * @internal
  */
 class FeedForm extends ContentEntityForm {
 

core/modules/aggregator/src/Form/FeedDeleteForm.php

@@ -7,6 +7,8 @@ use Drupal\Core\Url;
 
 /**
  * Provides a form for deleting a feed.
+ *
+ * @internal
  */
 class FeedDeleteForm extends ContentEntityDeleteForm {
 

core/modules/aggregator/src/Form/FeedItemsDeleteForm.php

@@ -8,6 +8,8 @@ use Drupal\Core\Url;
 
 /**
  * Provides a deletion confirmation form for items that belong to a feed.
+ *
+ * @internal
  */
 class FeedItemsDeleteForm extends ContentEntityConfirmFormBase {
 

core/modules/aggregator/src/Form/OpmlFeedAdd.php

@@ -12,6 +12,8 @@ use GuzzleHttp\ClientInterface;
 
 /**
  * Imports feeds from OPML.
+ *
+ * @internal
  */
 class OpmlFeedAdd extends FormBase {
 

core/modules/aggregator/src/Form/SettingsForm.php

@@ -13,6 +13,8 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Configures aggregator settings for this site.
+ *
+ * @internal
  */
 class SettingsForm extends ConfigFormBase {
 

core/modules/aggregator/src/Plugin/Block/AggregatorFeedBlock.php

@@ -167,8 +167,10 @@ class AggregatorFeedBlock extends BlockBase implements ContainerFactoryPluginInt
    */
   public function getCacheTags() {
     $cache_tags = parent::getCacheTags();
-    $feed = $this->feedStorage->load($this->configuration['feed']);
-    return Cache::mergeTags($cache_tags, $feed->getCacheTags());
+    if ($feed = $this->feedStorage->load($this->configuration['feed'])) {
+      $cache_tags = Cache::mergeTags($cache_tags, $feed->getCacheTags());
+    }
+    return $cache_tags;
   }
 
 }

core/modules/aggregator/tests/modules/aggregator_test/aggregator_test.info.yml

@@ -5,8 +5,8 @@ package: Testing
 # version: VERSION
 # core: 8.x
 
-# Information added by Drupal.org packaging script on 2018-01-03
-version: '8.4.4'
+# Information added by Drupal.org packaging script on 2018-03-07
+version: '8.5.0'
 core: '8.x'
 project: 'drupal'
-datestamp: 1515021228
+datestamp: 1520457826

core/modules/aggregator/tests/modules/aggregator_test_views/aggregator_test_views.info.yml

@@ -8,8 +8,8 @@ dependencies:
   - aggregator
   - views
 
-# Information added by Drupal.org packaging script on 2018-01-03
-version: '8.4.4'
+# Information added by Drupal.org packaging script on 2018-03-07
+version: '8.5.0'
 core: '8.x'
 project: 'drupal'
-datestamp: 1515021228
+datestamp: 1520457826

core/modules/aggregator/tests/src/Kernel/Migrate/MigrateAggregatorStubTest.php

@@ -2,7 +2,6 @@
 
 namespace Drupal\Tests\aggregator\Kernel\Migrate;
 
-use Drupal\migrate\MigrateException;
 use Drupal\Tests\migrate_drupal\Kernel\MigrateDrupalTestBase;
 use Drupal\migrate_drupal\Tests\StubTestTrait;
 
@@ -40,18 +39,6 @@ class MigrateAggregatorStubTest extends MigrateDrupalTestBase {
    * Tests creation of aggregator feed items.
    */
   public function testItemStub() {
-    try {
-      // We expect an exception, because there's no feed to reference.
-      $this->performStubTest('aggregator_item');
-      $this->fail('Expected exception has not been thrown.');
-    }
-    catch (MigrateException $e) {
-      $this->assertIdentical($e->getMessage(),
-        'Stubbing failed, unable to generate value for field fid');
-    }
-
-    // The stub should pass when there's a feed to point to.
-    $this->createStub('aggregator_feed');
     $this->performStubTest('aggregator_item');
   }