Updated Drupal to 8.6. This goes with the following updates because it's possible...

[yaffs-website] / web / core / modules / aggregator / src / Form / SettingsForm.php

diff --git a/web/core/modules/aggregator/src/Form/SettingsForm.php b/web/core/modules/aggregator/src/Form/SettingsForm.php
index 3014c5b9beb3d5b99905b1f475dcb4dba999849c..b19d2078fdabce72f0f3f1f0db9eed35dae35762 100644 (file)
--- a/web/core/modules/aggregator/src/Form/SettingsForm.php
+++ b/web/core/modules/aggregator/src/Form/SettingsForm.php
@@ -3,7 +3,7 @@
 namespace Drupal\aggregator\Form;
 
 use Drupal\aggregator\Plugin\AggregatorPluginManager;
-use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Component\Render\FormattableMarkup;
 use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Plugin\PluginFormInterface;
@@ -68,7 +68,7 @@ class SettingsForm extends ConfigFormBase {
     // Get all available fetcher, parser and processor definitions.
     foreach (['fetcher', 'parser', 'processor'] as $type) {
       foreach ($this->managers[$type]->getDefinitions() as $id => $definition) {
-        $this->definitions[$type][$id] = SafeMarkup::format('@title <span class="description">@description</span>', ['@title' => $definition['title'], '@description' => $definition['description']]);
+        $this->definitions[$type][$id] = new FormattableMarkup('@title <span class="description">@description</span>', ['@title' => $definition['title'], '@description' => $definition['description']]);
       }
     }
   }